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

Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().

Browse Source 
Originally committed as revision 16255 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-12-21 21:30:36 +00:00
parent 2f3d7ea974
commit c62da7972b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h263.c
View File

@ -6065,7 +6065,7 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
if(s->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){
skip_bits(gb, 24);
if(get_bits(gb, 8) == 0xF0)
return decode_vop_header(s, gb);
goto end;
}
startcode = 0xff;
@ -6128,12 +6128,16 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
mpeg4_decode_gop_header(s, gb);
}
else if(startcode == VOP_STARTCODE){
return decode_vop_header(s, gb);
break;
}
align_get_bits(gb);
startcode = 0xff;
}
end:
if(s->flags& CODEC_FLAG_LOW_DELAY)
s->low_delay=1;
return decode_vop_header(s, gb);
}
/* don't understand why they choose a different header ! */

3
libavcodec/h263dec.c
View File

@ -402,9 +402,6 @@ retry:
ret = ff_mpeg4_decode_picture_header(s, &gb);
}
ret = ff_mpeg4_decode_picture_header(s, &s->gb);
if(s->flags& CODEC_FLAG_LOW_DELAY)
s->low_delay=1;
} else if (s->codec_id == CODEC_ID_H263I) {
ret = intel_h263_decode_picture_header(s);
} else if (s->h263_flv) {