[MPlayer-cvslog] r22172 - trunk/libmpdemux/demux_rtp_codec.cpp

[nicodvb]

Author: nicodvb
Date: Thu Feb  8 00:41:07 2007
New Revision: 22172

Modified:
   trunk/libmpdemux/demux_rtp_codec.cpp

Log:
when the video codec is mpeg4video copy the content of the esds in extradata; patch by ceyes ag or at

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	(original)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Thu Feb  8 00:41:07 2007
@@ -91,6 +91,7 @@
     bih->biWidth = qtRTPSource->qtState.width;
     bih->biHeight = qtRTPSource->qtState.height;
     if (bih->biCompression == mmioFOURCC('a','v','c','1') ||
+        bih->biCompression == mmioFOURCC('m','p','4','v') ||
         bih->biCompression == mmioFOURCC('S','V','Q','3')) {
       uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 86;
       uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom
@@ -98,7 +99,9 @@
       while (pos+8 < endpos) {
         unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3];
         if (atomLength == 0 || atomLength > endpos-pos) break;
-        if ((!memcmp(pos+4, "avcC", 4) || !memcmp(pos+4, "SMI ", 4)) &&
+        if ((!memcmp(pos+4, "avcC", 4) || 
+             !memcmp(pos+4, "esds", 4) || 
+             !memcmp(pos+4, "SMI ", 4)) &&
             atomLength > 8 &&
             atomLength <= INT_MAX-sizeof(BITMAPINFOHEADER)) {
           bih->biSize = sizeof(BITMAPINFOHEADER)+atomLength-8;