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

[cehoyos]

Author: cehoyos
Date: Mon Mar 26 11:35:03 2007
New Revision: 22827

Modified:
   trunk/libmpdemux/demux_rtp_codec.cpp

Log:
Handle X-QT extradata in a slightly more correct way

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	(original)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Mon Mar 26 11:35:03 2007
@@ -106,18 +106,15 @@ void rtpCodecInitialize_video(demuxer_t*
     bih->biCompression = sh_video->format = fourcc;
     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
                         + qtRTPSource->qtState.sdAtomSize;
       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) || 
+        if ((!memcmp(pos+4, "avcC", 4) && fourcc==mmioFOURCC('a','v','c','1') || 
              !memcmp(pos+4, "esds", 4) || 
-             !memcmp(pos+4, "SMI ", 4)) &&
+             !memcmp(pos+4, "SMI ", 4) && fourcc==mmioFOURCC('S','V','Q','3')) &&
             atomLength > 8) {
           sh_video->bih = bih = 
               insertVideoExtradata(bih, pos+8, atomLength-8);
@@ -125,7 +122,6 @@ void rtpCodecInitialize_video(demuxer_t*
         }
         pos += atomLength;
       }
-    }
     needVideoFrameRate(demuxer, subsession);
   } else {
     fprintf(stderr,