On Wed, Jul 22, 2015 at 11:21 AM, Anton Khirnov <[email protected]> wrote: > Quoting Vittorio Giovara (2015-07-20 19:21:22) >> diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c >> index d0c0439..e7345d5 100644 >> --- a/libavcodec/motion_est.c >> +++ b/libavcodec/motion_est.c >> @@ -31,6 +31,8 @@ >> #include <stdio.h> >> #include <limits.h> >> >> +#include "libavutil/internal.h" >> + >> #include "avcodec.h" >> #include "internal.h" >> #include "mathops.h" >> @@ -309,12 +311,22 @@ int ff_init_me(MpegEncContext *s){ >> av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB >> diamond\n"); >> return -1; >> } >> - if (s->me_method != ME_ZERO && >> - s->me_method != ME_EPZS && >> - s->me_method != ME_X1) { >> - 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; >> + >> +#if FF_API_MOTION_EST >> +FF_DISABLE_DEPRECATION_WARNINGS >> + if (s->motion_est == FF_ME_ZERO) { > > Doesn't this make it impossible to actually use FF_ME_ZERO?
umh, this should have been FF_ME_EPZS, the old default. In this way when the new default is found, the old variable is checked and initialized to the same value of the old default (if set). I'll send the small amendment to be squashed here. -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
