# HG changeset patch
# User michael
# Date 1220228520 0
# Node ID 10242bdaac34e0f378942fea25dbdba9bb335059
# Parent  72d421816e078b089a20c3524db2c0612c0582ad
1000l Fix snow regression test that i broke in r15135.

diff -r 72d421816e07 -r 10242bdaac34 motion_est.c
--- a/motion_est.c	Sun Aug 31 23:55:47 2008 +0000
+++ b/motion_est.c	Mon Sep 01 00:22:00 2008 +0000
@@ -240,7 +240,8 @@
         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;
     }