eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc: Drop deprecated options moved to private contexts

Browse Source 
Deprecated in 10/2014 and 07/2015.
This commit is contained in:
Vittorio Giovara
2017-03-16 16:03:38 -04:00
parent c43a96fe16
commit 94eed68ace
14 changed files with 1 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/motion_est.c
View File

@@ -310,25 +310,6 @@ int ff_init_me(MpegEncContext *s){
return -1;
}
#if FF_API_MOTION_EST
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 {
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(cache_size < 2*dia_size && !c->stride){