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 /libavcodec/error_resilience.c | |
parent | 0871e2337777d9161e7f3554bcad19dabc9e15e1 (diff) | |
download | ffmpeg-streaming-dcc39ee10e82833ce24aa57926c00ffeb1948198.zip ffmpeg-streaming-dcc39ee10e82833ce24aa57926c00ffeb1948198.tar.gz |
lavc: Remove deprecated XvMC support hacks
Deprecated in 11/2013.
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r-- | libavcodec/error_resilience.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index bf3a688..54b7b3c 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -35,7 +35,6 @@ #include "mpegvideo.h" #include "rectangle.h" #include "thread.h" -#include "version.h" /** * @param stride the number of MVs to get to the next row @@ -677,16 +676,6 @@ static int is_intra_more_likely(ERContext *s) if (undamaged_count < 5) return 0; // almost all MBs damaged -> use temporal prediction -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - // prevent dsp.sad() check, that requires access to the image - if (CONFIG_MPEG_XVMC_DECODER && - s->avctx->xvmc_acceleration && - s->cur_pic.f->pict_type == AV_PICTURE_TYPE_I) - return 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ - skip_amount = FFMAX(undamaged_count / 50, 1); // check only up to 50 MBs is_intra_likely = 0; @@ -1102,13 +1091,6 @@ void ff_er_frame_end(ERContext *s) } else guess_mv(s); -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - /* the filters below are not XvMC compatible, skip them */ - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) - goto ec_clean; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ /* fill DC for inter blocks */ for (mb_y = 0; mb_y < s->mb_height; mb_y++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) { @@ -1202,9 +1184,6 @@ FF_ENABLE_DEPRECATION_WARNINGS s->mb_height, linesize[2], 0); } -#if FF_API_XVMC -ec_clean: -#endif /* clean a few tables */ for (i = 0; i < s->mb_num; i++) { const int mb_xy = s->mb_index2xy[i]; |