Commit b74ec693 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent c541e668
...@@ -240,6 +240,10 @@ int ff_init_me(MpegEncContext *s){ ...@@ -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"); av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n");
return -1; 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; c->avctx= s->avctx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment