diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-16 16:03:38 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:17 +0100 |
| commit | 94eed68ace9f2416af8457fcbf142b175928c06b (patch) | |
| tree | 6c4c97060df6dcb4128c959bb3b4b281bc85feb7 /libavcodec/libxavs.c | |
| parent | c43a96fe16e6a6ea091e64ca271f0788f4a0bea9 (diff) | |
| download | ffmpeg-94eed68ace9f2416af8457fcbf142b175928c06b.tar.gz | |
lavc: Drop deprecated options moved to private contexts
Deprecated in 10/2014 and 07/2015.
Diffstat (limited to 'libavcodec/libxavs.c')
| -rw-r--r-- | libavcodec/libxavs.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index b7a6c41666..24ddd22e5f 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -285,32 +285,6 @@ static av_cold int XAVS_init(AVCodecContext *avctx) if (x4->cplxblur >= 0) x4->params.rc.f_complexity_blur = x4->cplxblur; -#if FF_API_MOTION_EST -FF_DISABLE_DEPRECATION_WARNINGS - if (x4->motion_est < 0) { - switch (avctx->me_method) { - case ME_EPZS: - x4->params.analyse.i_me_method = XAVS_ME_DIA; - break; - case ME_HEX: - x4->params.analyse.i_me_method = XAVS_ME_HEX; - break; - case ME_UMH: - x4->params.analyse.i_me_method = XAVS_ME_UMH; - break; - case ME_FULL: - x4->params.analyse.i_me_method = XAVS_ME_ESA; - break; - case ME_TESA: - x4->params.analyse.i_me_method = XAVS_ME_TESA; - break; - default: - x4->params.analyse.i_me_method = XAVS_ME_HEX; - } - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - x4->params.i_bframe = avctx->max_b_frames; /* cabac is not included in AVS JiZhun Profile */ x4->params.b_cabac = 0; |