Commit b42b7636 authored by michael's avatar michael

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
parent 757364fc
...@@ -438,12 +438,12 @@ static int rv20_decode_picture_header(MpegEncContext *s) ...@@ -438,12 +438,12 @@ static int rv20_decode_picture_header(MpegEncContext *s)
} }
seq= get_bits(&s->gb, 14)<<1; 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); f= get_bits(&s->gb, av_log2(v-1)+1);
} }
if(s->avctx->debug & FF_DEBUG_PICT_INFO){ 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); mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment