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/svq1enc.c | |
parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/svq1enc.c')
-rw-r--r-- | libavcodec/svq1enc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index d78ede72cd..80a8af1ef7 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -283,19 +283,6 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, s->m.b8_stride = 2 * s->m.mb_width + 1; s->m.f_code = 1; s->m.pict_type = s->pict_type; -#if FF_API_MOTION_EST -FF_DISABLE_DEPRECATION_WARNINGS - s->m.me_method = s->avctx->me_method; - if (s->motion_est == FF_ME_EPZS) { - if (s->avctx->me_method == ME_ZERO) - s->motion_est = FF_ME_ZERO; - else if (s->avctx->me_method == ME_EPZS) - s->motion_est = FF_ME_EPZS; - else if (s->avctx->me_method == ME_X1) - s->motion_est = FF_ME_XONE; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->m.motion_est = s->motion_est; s->m.me.scene_change_score = 0; // s->m.out_format = FMT_H263; |