diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-04 14:02:35 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-04 14:02:35 +0000 |
| commit | 7a66e827a13e78d4fa4469906c860f533067b393 (patch) | |
| tree | 29fb667d48499901b5e9d59dec1087533495cbec /libmpdemux | |
| parent | d55aa4a91d76c58f4c90dc2405b06c7f5010f06f (diff) | |
| download | mpv-7a66e827a13e78d4fa4469906c860f533067b393.tar.bz2 mpv-7a66e827a13e78d4fa4469906c860f533067b393.tar.xz | |
support for SVQ3 in X-QT; patch by Carl Eugen Hoyos (cehoyos ag or at) approved by Ross
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22130 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 0eb3e60e93..a16857048c 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -90,14 +90,15 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, 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; |