Commit 421de3b8 authored by michael's avatar michael

fixing playback of xvid pretending to be divx (sample_vop_nc.avi)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4021 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1461f4e8
...@@ -5991,7 +5991,7 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) ...@@ -5991,7 +5991,7 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
startcode = ((startcode << 8) | v) & 0xffffffff; startcode = ((startcode << 8) | v) & 0xffffffff;
if(get_bits_count(gb) >= gb->size_in_bits){ if(get_bits_count(gb) >= gb->size_in_bits){
if(gb->size_in_bits==8 && s->divx_version){ if(gb->size_in_bits==8 && (s->divx_version || s->xvid_build)){
av_log(s->avctx, AV_LOG_ERROR, "frame skip %d\n", gb->size_in_bits); av_log(s->avctx, AV_LOG_ERROR, "frame skip %d\n", gb->size_in_bits);
return FRAME_SKIPED; //divx bug return FRAME_SKIPED; //divx bug
}else }else
......
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