diff options
| -rw-r--r-- | src/lib/ffmpeg-1.2/avcodec.pas | 10 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.2/avformat.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.2/libavutil/log.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.2/libavutil/pixfmt.pas | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/ffmpeg-1.2/avcodec.pas b/src/lib/ffmpeg-1.2/avcodec.pas index ff56e8e0..d0d3ba72 100644 --- a/src/lib/ffmpeg-1.2/avcodec.pas +++ b/src/lib/ffmpeg-1.2/avcodec.pas @@ -662,7 +662,8 @@ type AV_CODEC_ID_MICRODVD = $6D445644, // MKBETAG('m','D','V','D'), AV_CODEC_ID_EVRC = $73657663, // MKBETAG('s','e','v','c'), AV_CODEC_ID_SMV = $73736D76, // MKBETAG('s','s','m','v'), - AV_CODEC_ID_TAK = $7442614B // MKBETAG('t','B','a','K') + AV_CODEC_ID_TAK = $7442614B // MKBETAG('t','B','a','K'), + ); type @@ -1190,7 +1191,7 @@ const FF_DEBUG_VIS_QP = $00002000; FF_DEBUG_VIS_MB_TYPE = $00004000; FF_DEBUG_BUFFERS = $00008000; - FF_DEBUG_THREADS = $00010000; + FF_DEBUG_THREADS = $00010000; FF_DEBUG_VIS_MV_P_FOR = $00000001; //visualize forward predicted MVs of P frames FF_DEBUG_VIS_MV_B_FOR = $00000002; //visualize forward predicted MVs of B frames @@ -1406,7 +1407,6 @@ type size: cint; type_: AVPacketSideDataType; end; - PAVPacketSideDataType = ^TAVPacketSideDataType; (** @@ -4788,7 +4788,7 @@ type filter_length: cint; log2_phase_count: cint; linear: cint; cutoff: cdouble): PReSampleContext; cdecl; external av__codec; deprecated; - + function audio_resample (s: PReSampleContext; output: PSmallint; input: PSmallint; nb_samples: cint): cint; cdecl; external av__codec; deprecated; @@ -4909,7 +4909,7 @@ function avpicture_get_size (pix_fmt: TAVPixelFormat; width: cint; height: cint) {$IFDEF FF_API_DEINTERLACE} (** - * deinterlace - if not supported return -1 *) + * deinterlace - if not supported return -1 * * @deprecated - use yadif (in libavfilter) instead *) diff --git a/src/lib/ffmpeg-1.2/avformat.pas b/src/lib/ffmpeg-1.2/avformat.pas index 1a4453be..408fe0ef 100644 --- a/src/lib/ffmpeg-1.2/avformat.pas +++ b/src/lib/ffmpeg-1.2/avformat.pas @@ -1138,7 +1138,7 @@ type * iformat/oformat.flags. In such a case, the (de)muxer will handle * I/O in some other way and this field will be NULL. *) - pb: PAVIOContext; + pb: PAVIOContext; (* stream info *) ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *) diff --git a/src/lib/ffmpeg-1.2/libavutil/log.pas b/src/lib/ffmpeg-1.2/libavutil/log.pas index 5adb0ec8..39ad09c8 100644 --- a/src/lib/ffmpeg-1.2/libavutil/log.pas +++ b/src/lib/ffmpeg-1.2/libavutil/log.pas @@ -128,8 +128,6 @@ type AV_CLASS_CATEGORY_NB ///< not part of ABI/API ); -type - // struct AVOptionRanges; (** diff --git a/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas b/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas index 8e1c87d4..da126bea 100644 --- a/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas @@ -175,11 +175,11 @@ type AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian - {** + (** * duplicated pixel formats for compatibility with libav. * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55) * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85) - *} + *) AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) |