From b74ec69366ca84e1edb7df10d1111224ec8477ca Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 31 Aug 2008 23:55:47 +0000 Subject: [PATCH] Warn the user about me_method values that are not supported. Fixes issue503 Originally committed as revision 15135 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motion_est.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 71fe90f420..5187ef7bb3 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -240,6 +240,10 @@ 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; + } c->avctx= s->avctx;