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 /libavcodec/codec_desc.c | |
| parent | c381f6a483e00ab8bfa4f777284b89acdad6dd94 (diff) | |
| parent | dcc39ee10e82833ce24aa57926c00ffeb1948198 (diff) | |
Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'
* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
lavc: Remove deprecated XvMC support hacks
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 669d2458c9..92bf1d2681 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -46,15 +46,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), }, -#if FF_API_XVMC - { - .id = AV_CODEC_ID_MPEG2VIDEO_XVMC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mpegvideo_xvmc", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), - .props = AV_CODEC_PROP_LOSSY, - }, -#endif /* FF_API_XVMC */ { .id = AV_CODEC_ID_H261, .type = AVMEDIA_TYPE_VIDEO, |