Originally committed as revision 15136 to svn://svn.ffmpeg.org/ffmpeg/trunk
Michael Niedermayer authored on 2008/09/01 09:22:00... | ... |
@@ -240,7 +240,8 @@ int ff_init_me(MpegEncContext *s){ |
240 | 240 |
av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n"); |
241 | 241 |
return -1; |
242 | 242 |
} |
243 |
- if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1){ |
|
243 |
+ //special case of snow is needed because snow uses its own iterative ME code |
|
244 |
+ if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1 && s->avctx->codec_id != CODEC_ID_SNOW){ |
|
244 | 245 |
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"); |
245 | 246 |
return -1; |
246 | 247 |
} |