[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec rv10.c,1.69,1.70

[Michael Niedermayer CVS]

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

Modified Files:
	rv10.c 
Log Message:
fixing broken_rv20_1mb_.rm


Index: rv10.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/rv10.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- rv10.c	24 Apr 2005 17:21:09 -0000	1.69
+++ rv10.c	24 Apr 2005 22:08:30 -0000	1.70
@@ -440,21 +440,23 @@
         }
         seq= get_bits(&s->gb, 14)<<1;
 
-        if(v>1 || (s->avctx->sub_id < 0x20201002 && v>0)){
-            f= get_bits(&s->gb, av_log2(v-1)+1);
-        }
-        
+        if(v) 
+            f= get_bits(&s->gb, av_log2(v));
+
         if(s->avctx->debug & FF_DEBUG_PICT_INFO){
             av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v);
         }
+    }else{
+        seq= get_bits(&s->gb, 8)*128;
+    }
 
+//     if(s->avctx->sub_id <= 0x20201002){ //0x20201002 definitely needs this 
+    mb_pos= ff_h263_decode_mba(s);
+/*    }else{
         mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
         s->mb_x= mb_pos % s->mb_width;
         s->mb_y= mb_pos / s->mb_width;
-    }else{
-        seq= get_bits(&s->gb, 8)*128;
-        mb_pos= ff_h263_decode_mba(s);
-    }
+    }*/
 //av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);
     seq |= s->time &~0x7FFF;
     if(seq - s->time >  0x4000) seq -= 0x8000;