diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 21:11:42 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 21:20:49 +0300 |
| commit | b46613dd9b8b4adc68312a283486c33c109aab19 (patch) | |
| tree | 8fd31b65306b5781bc8a2a4ae3fafff9e109839e /libavcodec/allcodecs.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/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 60b66d46b9..dea1b1d13b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -250,9 +250,6 @@ static void register_all(void) REGISTER_DECODER(MJPEGB, mjpegb); REGISTER_DECODER(MMVIDEO, mmvideo); REGISTER_DECODER(MOTIONPIXELS, motionpixels); -#if FF_API_XVMC - REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc); -#endif /* FF_API_XVMC */ REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video); REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video); REGISTER_ENCDEC (MPEG4, mpeg4); |