virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

another try at fixing rv20 ...

Browse Source 
Originally committed as revision 3749 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-12-13 11:41:59 +00:00
parent f48c0551ca
commit 74679f5c1c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/rv10.c
View File

@ -429,28 +429,21 @@ static int rv20_decode_picture_header(MpegEncContext *s)
} }
if(s->avctx->has_b_frames){ if(s->avctx->has_b_frames){
int f1=9; int f=9;
int f2=9; int v= s->avctx->extradata_size >= 4 ? ((uint8_t*)s->avctx->extradata)[1] : 0;
int f3=9;
if (get_bits(&s->gb, 1)){ if (get_bits(&s->gb, 1)){
av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n");
// return -1; // return -1;
} }
seq= get_bits(&s->gb, 14)<<1; seq= get_bits(&s->gb, 14)<<1;
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&1){ if(v>1){
f1= get_bits(&s->gb, 1); f= get_bits(&s->gb, av_log2(v-1)+1);
}
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&2){
f2= get_bits(&s->gb, 1);
}
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&4){
f3= get_bits(&s->gb, 2);
} }
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 %d %d\n", f1,f2,f3); av_log(s->avctx, AV_LOG_DEBUG, "F %d\n", f);
} }
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);