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

[nicodvb]

Author: nicodvb
Date: Sun Feb  4 15:02:35 2007
New Revision: 22130

Modified:
   trunk/libmpdemux/demux_rtp_codec.cpp

Log:
support for SVQ3 in X-QT; patch by Carl Eugen Hoyos (cehoyos ag or at) approved by Ross

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	(original)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Sun Feb  4 15:02:35 2007
@@ -90,14 +90,15 @@
     bih->biCompression = sh_video->format = fourcc;
     bih->biWidth = qtRTPSource->qtState.width;
     bih->biHeight = qtRTPSource->qtState.height;
-    if (bih->biCompression == mmioFOURCC('a','v','c','1')) {
+    if (bih->biCompression == mmioFOURCC('a','v','c','1') ||
+        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) == 0 &&
+        if ((!memcmp(pos+4, "avcC", 4) || !memcmp(pos+4, "SMI ", 4)) &&
             atomLength > 8 &&
             atomLength <= INT_MAX-sizeof(BITMAPINFOHEADER)) {
           bih->biSize = sizeof(BITMAPINFOHEADER)+atomLength-8;