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/libx264.c | |
| parent | c43a96fe16e6a6ea091e64ca271f0788f4a0bea9 (diff) | |
lavc: Drop deprecated options moved to private contexts
Deprecated in 10/2014 and 07/2015.
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index fddf1b3828..4448d977cf 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -547,24 +547,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (x4->nal_hrd >= 0) x4->params.i_nal_hrd = x4->nal_hrd; - if (x4->motion_est >= 0) { + if (x4->motion_est >= 0) x4->params.analyse.i_me_method = x4->motion_est; -#if FF_API_MOTION_EST -FF_DISABLE_DEPRECATION_WARNINGS - } else { - if (avctx->me_method == ME_EPZS) - x4->params.analyse.i_me_method = X264_ME_DIA; - else if (avctx->me_method == ME_HEX) - x4->params.analyse.i_me_method = X264_ME_HEX; - else if (avctx->me_method == ME_UMH) - x4->params.analyse.i_me_method = X264_ME_UMH; - else if (avctx->me_method == ME_FULL) - x4->params.analyse.i_me_method = X264_ME_ESA; - else if (avctx->me_method == ME_TESA) - x4->params.analyse.i_me_method = X264_ME_TESA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - } if (x4->coder >= 0) x4->params.b_cabac = x4->coder; @@ -803,9 +787,6 @@ static const AVCodecDefault x264_defaults[] = { { "nr", "-1" }, #endif { "me_range", "-1" }, -#if FF_API_MOTION_EST - { "me_method", "-1" }, -#endif { "subq", "-1" }, #if FF_API_PRIVATE_OPT { "b_strategy", "-1" }, |