diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-12-07 08:18:41 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:14 +0100 |
| commit | dcc39ee10e82833ce24aa57926c00ffeb1948198 (patch) | |
| tree | 7b7b69884477c4e2e70f4a5f7babc1c6ad056cf1 /libavutil | |
| parent | 0871e2337777d9161e7f3554bcad19dabc9e15e1 (diff) | |
lavc: Remove deprecated XvMC support hacks
Deprecated in 11/2013.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 10 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index d69eeea9de..e4e5674a66 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -313,16 +313,6 @@ static 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, - }, - [AV_PIX_FMT_XVMC_MPEG2_IDCT] = { - .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 41498ccef7..0b7582576b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -71,10 +71,6 @@ enum AVPixelFormat { AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_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 93f471f99b..904d387411 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_VDPAU #define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) #endif -#ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56) -#endif #ifndef FF_API_OPT_TYPE_METADATA #define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) #endif |