[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec snow.c,1.87,1.88

[Michael Niedermayer CVS]

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

Modified Files:
	snow.c 
Log Message:
fix %8 != 0 w/h


Index: snow.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- snow.c	30 Jan 2006 23:33:18 -0000	1.87
+++ snow.c	11 Mar 2006 00:18:43 -0000	1.88
@@ -2520,11 +2520,11 @@
             ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+5, b_h+5, sx, sy, w, h);
             src= tmp + MB_SIZE;
         }
-        assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
-        assert(!(b_w&(b_w-1)));
+//        assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
+//        assert(!(b_w&(b_w-1)));
         assert(b_w>1 && b_h>1);
         assert(tab_index>=0 && tab_index<4 || b_w==32);
-        if((dx&3) || (dy&3))
+        if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)))
             mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
         else if(b_w==32){
             int y;