diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 03:13:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 03:26:35 +0100 |
| commit | 5231eecdafff38d0b604c028be08f8fb78d55e53 (patch) | |
| tree | 325e3398888cbae2afcef0f3c91dc8a347f53168 /libavutil | |
| parent | e25ed2608c960302d6f4832a5435c9672d78e282 (diff) | |
| parent | 19e30a58fc8ee6187a0bc14aff7f566a13c81421 (diff) | |
| download | ffmpeg-5231eecdafff38d0b604c028be08f8fb78d55e53.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Deprecate obsolete XvMC hardware decoding support
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/old_pix_fmts.h | 2 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 3 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/old_pix_fmts.h b/libavutil/old_pix_fmts.h index 3ee8aec145..cd1ed7c19f 100644 --- a/libavutil/old_pix_fmts.h +++ b/libavutil/old_pix_fmts.h @@ -44,8 +44,10 @@ PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range +#if FF_API_XVMC PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing PIX_FMT_XVMC_MPEG2_IDCT, +#endif /* FF_API_XVMC */ PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 9a33000e61..0cb2f34f57 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -29,6 +29,7 @@ #include "internal.h" #include "intreadwrite.h" #include "avstring.h" +#include "version.h" void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], @@ -313,6 +314,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, +#if FF_API_XVMC [AV_PIX_FMT_XVMC_MPEG2_MC] = { .name = "xvmcmc", .flags = AV_PIX_FMT_FLAG_HWACCEL, @@ -321,6 +323,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "xvmcidct", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, +#endif /* FF_API_XVMC */ [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 7b17a4f0c4..3d32d3eec9 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -80,8 +80,10 @@ enum AVPixelFormat { 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 +#if FF_API_XVMC AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_IDCT, +#endif /* FF_API_XVMC */ 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) diff --git a/libavutil/version.h b/libavutil/version.h index 2e2f5710ba..bd5e7b88e3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -144,6 +144,9 @@ #ifndef FF_API_OLD_OPENCL #define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 53) #endif +#ifndef FF_API_XVMC +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 53) +#endif /** * @} |