diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-26 09:35:03 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-26 09:35:03 +0000 |
| commit | 927cde6251f7e77930c8dd9a71469658214f059d (patch) | |
| tree | 100a537bc52e5e0a0bb8189b5a5dfd5758fdfdd9 /libmpdemux | |
| parent | 91e150c01922ef89f93249392ad29effc9f07ee8 (diff) | |
| download | mpv-927cde6251f7e77930c8dd9a71469658214f059d.tar.bz2 mpv-927cde6251f7e77930c8dd9a71469658214f059d.tar.xz | |
Handle X-QT extradata in a slightly more correct way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22827 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 4df701b8b9..578d4e6cc0 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -106,18 +106,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') || - 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* demuxer, } pos += atomLength; } - } needVideoFrameRate(demuxer, subsession); } else { fprintf(stderr, |