diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-06-16 00:40:08 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-06-16 00:40:08 +0000 |
| commit | 5b78c67260c14642ca29844750752ac2aa9d8333 (patch) | |
| tree | f792a0a4ebca0f281d116c877e75b25727b71ad9 /src/lib/ffmpeg-2.2/libavutil/pixfmt.pas | |
| parent | 167220739fc0b7506ee87c51696d259e95c2b0ed (diff) | |
| download | usdx-5b78c67260c14642ca29844750752ac2aa9d8333.tar.gz usdx-5b78c67260c14642ca29844750752ac2aa9d8333.tar.xz usdx-5b78c67260c14642ca29844750752ac2aa9d8333.zip | |
Update libavutil files for ffmpeg 2.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3073 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/pixfmt.pas | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas b/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas index 09a0aff0..bd3cba6e 100644 --- a/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/pixfmt.h - * avutil version 52.48.100 + * avutil version 52.66.100 * *) @@ -81,9 +81,12 @@ type AV_PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range - AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range + AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range +{$IFDEF FF_API_XVMC} AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_IDCT, + {$define AV_PIX_FMT_XVMC := (AV_PIX_FMT_XVMC_MPEG2_IDCT)} +{$ENDIF} AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) @@ -262,7 +265,9 @@ type AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ - +{$ifndef FF_API_XVMC} + AV_PIX_FMT_XVMC, ///< XVideo Motion Acceleration via common packet passing +{$endif} AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions ); |