# HG changeset patch # User michael # Date 1147095894 0 # Node ID 8c9825dbea20b673c45627d228dead925025691b # Parent 539af98972f43664ba80d3624ed4b3413c4cb0f2 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) diff -r 539af98972f4 -r 8c9825dbea20 h263.c --- a/h263.c Sun May 07 17:30:00 2006 +0000 +++ b/h263.c Mon May 08 13:44:54 2006 +0000 @@ -4516,6 +4516,12 @@ /* 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])