[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec snow.c,1.70,1.71

Michael Niedermayer CVS michael
Thu Dec 29 03:17:53 CET 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv5945

Modified Files:
	snow.c 
Log Message:
4mv + iter ME 10l fix (still not bugfree but better)


Index: snow.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- snow.c	28 Dec 2005 23:45:16 -0000	1.70
+++ snow.c	29 Dec 2005 02:17:51 -0000	1.71
@@ -2294,14 +2294,14 @@
 
     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){





More information about the ffmpeg-cvslog mailing list