diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 17:06:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 17:08:32 -0300 |
| commit | bfab4308560c277d754c214210758a865fcc7348 (patch) | |
| tree | 609493b886bed4b8a94bf89a6b8cad269224fb3b /libavcodec/libx264.c | |
| parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
| parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
| download | ffmpeg-bfab4308560c277d754c214210758a865fcc7348.tar.gz | |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
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 b5e04d674d..9c67c91f33 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -701,24 +701,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; @@ -1003,9 +987,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" }, |