[SCM] libav/experimental: fixing decoding of http://mplayerhq.hu/~atmos4/ffrv20-crashing-atmos.rm

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f6d5112387204d881fcdc69efc4f590ff00acfcb
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 5 02:36:10 2005 +0000

    fixing decoding of http://mplayerhq.hu/~atmos4/ffrv20-crashing-atmos.rm
    
    Originally committed as revision 3808 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 4a6bf0f..1a8ab05 100644
--- 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);

-- 
Libav/FFmpeg packaging