From ad8cbddeaf4c412ea62288affa437ee5cbc26c66 Mon Sep 17 00:00:00 2001 From: brian-ch Date: Wed, 25 Dec 2013 02:31:51 +0000 Subject: Update pixfmt and fix typo in avcodec git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3052 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-2.1/avcodec.pas | 6 +++--- src/lib/ffmpeg-2.1/libavutil/pixfmt.pas | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/ffmpeg-2.1/avcodec.pas b/src/lib/ffmpeg-2.1/avcodec.pas index f9f7ff50..8bfbe6bb 100644 --- a/src/lib/ffmpeg-2.1/avcodec.pas +++ b/src/lib/ffmpeg-2.1/avcodec.pas @@ -668,10 +668,10 @@ type AV_CODEC_ID_Y41P = $59343150, // MKBETAG('Y','4','1','P'), AV_CODEC_ID_YUV4 = $59555634, // MKBETAG('Y','U','V','4'), AV_CODEC_ID_EIA_608 = $63363038, // MKBETAG('c','6','0','8'), - AV_CODEC_ID_MICRODVD = $6D445644 // MKBETAG('m','D','V','D') + 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'), ); @@ -693,7 +693,7 @@ const * @see avcodec_get_descriptor() *) type - record AVCodecDescriptor = + TAVCodecDescriptor = record id: TAVCodecID; type_: TAVMediaType; (** diff --git a/src/lib/ffmpeg-2.1/libavutil/pixfmt.pas b/src/lib/ffmpeg-2.1/libavutil/pixfmt.pas index c5cdb0ea..09a0aff0 100644 --- a/src/lib/ffmpeg-2.1/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-2.1/libavutil/pixfmt.pas @@ -105,11 +105,13 @@ type AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) +{$IFDEF FF_API_VDPAU} AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers +{$ENDIF} AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian @@ -133,7 +135,9 @@ type AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +{$IFDEF FF_API_VDPAU} AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers +{$ENDIF} AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 -- cgit v1.2.3