[MPlayer-dev-eng] [RFC] h264 ES parser problems

[Reimar Döffinger]

Hi,
On Fri, Sep 16, 2005 at 09:44:19AM +0200, Nico Sabbi wrote:
> why did you remove the &~0x60 mask?

Because I did not yet get to the part of the spec that says anything
about that *g*.
But the attached patch works for that sample, too.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libmpdemux/video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.53
diff -u -r1.53 video.c
--- libmpdemux/video.c	26 Aug 2005 22:53:59 -0000	1.53
+++ libmpdemux/video.c	16 Sep 2005 08:55:24 -0000
@@ -532,7 +533,8 @@
             if(!i) return -1;
             if(!read_video_packet(d_video)) return -1; // EOF
           }
-          if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break;
+          i &= ~0x60;
+          if ((i >= 0x106 && i <= 0x109) || (i >= 0x10e && i <= 0x112)) break;
         }
 	*start=videobuffer; in_size=videobuf_len;
 	videobuf_len=0;