From 3b29cb6b5914a4830e74237480b8b8f678d91de0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 8 May 2006 13:44:54 +0000 Subject: [PATCH] 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 --- libavcodec/h263.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 29df3b9398..f88114f70f 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -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])