[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h263.c,1.308,1.309

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv27241

Modified Files:
	h263.c 
Log Message:
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)


Index: h263.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- h263.c	28 Apr 2006 17:29:07 -0000	1.308
+++ h263.c	8 May 2006 13:44:54 -0000	1.309
@@ -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])