fixing decoding of http://mplayerhq.hu/~atmos4/ffrv20-crashing-atmos.rm

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3808 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 4a6bf0f72e85e340c6dbad6e55576396b6320b3a..1a8ab054e0d582a3a800dab02356124f0c173a5f 100644 (file)
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -438,12 +438,12 @@ static int rv20_decode_picture_header(MpegEncContext *s)
         }
         seq= get_bits(&s->gb, 14)<<1;
 
-        if(v>1){
+        if(v>1 || (s->avctx->sub_id < 0x20201002 && v>0)){
             f= get_bits(&s->gb, av_log2(v-1)+1);
         }
         
         if(s->avctx->debug & FF_DEBUG_PICT_INFO){
-            av_log(s->avctx, AV_LOG_DEBUG, "F %d\n", f);
+            av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v);
         }
 
         mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);