1000l Fix snow regression test that i broke in r15135.

Originally committed as revision 15136 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 5187ef7bb3..7c1fc677d2 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -240,7 +240,8 @@ 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){
+    //special case of snow is needed because snow uses its own iterative ME code
+    if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1 && s->avctx->codec_id != CODEC_ID_SNOW){
         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;
     }