diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-16 23:03:38 +0300 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 12:09:17 +0300 |
| commit | 94eed68ace9f2416af8457fcbf142b175928c06b (patch) | |
| tree | 6c4c97060df6dcb4128c959bb3b4b281bc85feb7 /libavcodec/svq1enc.c | |
| parent | c43a96fe16e6a6ea091e64ca271f0788f4a0bea9 (diff) | |
lavc: Drop deprecated options moved to private contexts
Deprecated in 10/2014 and 07/2015.
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 12a23d0612..963fbe4401 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -272,19 +272,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; |