summaryrefslogtreecommitdiff
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-01-05 02:36:10 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-01-05 02:36:10 +0000
commitf6d5112387204d881fcdc69efc4f590ff00acfcb (patch)
treec7bbea5a361d7476d62bb3f5400f9ac69051af49 /libavcodec/rv10.c
parentf4e2c4b13471ceacc801b573a01d23ed2ab2b4e2 (diff)
fixing decoding of http://mplayerhq.hu/~atmos4/ffrv20-crashing-atmos.rm
Originally committed as revision 3808 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 4a6bf0f72e..1a8ab054e0 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);