1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

add outcommented chunk of code to handle stuffing MBs at the end of slices (IMHO the standard doesnt allow this and there are no real world files which need it)

Originally committed as revision 5350 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-05-08 13:44:54 +00:00
parent 902c748ce5
commit 3b29cb6b59

View File

@ -4516,6 +4516,12 @@ end:
/* per-MB end of slice check */
if(s->codec_id==CODEC_ID_MPEG4){
#if 0 //http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-4_2004_Conformance_Testing/video_conformance/version_1/simple/ERROR.ZIP/mit025.m4v needs this but its unclear if the mpeg4 standard allows this at all (MN)
if(s->pict_type != B_TYPE){
while(show_bits(&s->gb, 9 + (s->pict_type == P_TYPE)) == 1)
skip_bits(&s->gb, 9 + (s->pict_type == P_TYPE));
}
#endif
if(mpeg4_is_resync(s)){
const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
if(s->pict_type==B_TYPE && s->next_picture.mbskip_table[xy + delta])