diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:11:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:20:49 -0300 |
| commit | b46613dd9b8b4adc68312a283486c33c109aab19 (patch) | |
| tree | 8fd31b65306b5781bc8a2a4ae3fafff9e109839e /libavutil/pixdesc.c | |
| parent | c381f6a483e00ab8bfa4f777284b89acdad6dd94 (diff) | |
| parent | dcc39ee10e82833ce24aa57926c00ffeb1948198 (diff) | |
| download | ffmpeg-b46613dd9b8b4adc68312a283486c33c109aab19.tar.gz | |
Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'
* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
lavc: Remove deprecated XvMC support hacks
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index a428d63066..81b763b961 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -326,22 +326,10 @@ 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 */ -#if !FF_API_XVMC [AV_PIX_FMT_XVMC] = { .name = "xvmc", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, -#endif /* !FF_API_XVMC */ [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", .nb_components = 3, |