4mv + iter ME 10l fix (still not bugfree but better)

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

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 559955e..f6c1f86 100644 (file)
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -2294,14 +2294,14 @@ static void encode_q_branch2(SnowContext *s, int level, int x, int y){
 
     if(level!=s->block_max_depth){
         if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){
+            put_rac(&s->c, &s->block_state[4 + s_context], 1);
+        }else{
             put_rac(&s->c, &s->block_state[4 + s_context], 0);
             encode_q_branch2(s, level+1, 2*x+0, 2*y+0);
             encode_q_branch2(s, level+1, 2*x+1, 2*y+0);
             encode_q_branch2(s, level+1, 2*x+0, 2*y+1);
             encode_q_branch2(s, level+1, 2*x+1, 2*y+1);
             return;
-        }else{
-            put_rac(&s->c, &s->block_state[4 + s_context], 1);
         }
     }
     if(b->type & BLOCK_INTRA){