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/motion_est.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/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 316d16a77b..8b5ce2117a 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -313,26 +313,6 @@ int ff_init_me(MpegEncContext *s){ return -1; } -#if FF_API_MOTION_EST - //special case of snow is needed because snow uses its own iterative ME code -FF_DISABLE_DEPRECATION_WARNINGS - if (s->motion_est == FF_ME_EPZS) { - if (s->me_method == ME_ZERO) - s->motion_est = FF_ME_ZERO; - else if (s->me_method == ME_EPZS) - s->motion_est = FF_ME_EPZS; - else if (s->me_method == ME_X1) - s->motion_est = FF_ME_XONE; - else if (s->avctx->codec_id != AV_CODEC_ID_SNOW) { - av_log(s->avctx, AV_LOG_ERROR, - "me_method is only allowed to be set to zero and epzs; " - "for hex,umh,full and others see dia_size\n"); - return -1; - } - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - c->avctx= s->avctx; if(s->codec_id == AV_CODEC_ID_H261) |