diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-07 23:41:07 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-07 23:41:07 +0000 |
| commit | b383bd659a070932ded94d4bd6fbcdc884c3f79f (patch) | |
| tree | aafcb93a6657fa906d26e3a98ec3533eaf2ded55 /libmpdemux | |
| parent | cb3c29effee812089b1b83edeca74516b2b8ded1 (diff) | |
| download | mpv-b383bd659a070932ded94d4bd6fbcdc884c3f79f.tar.bz2 mpv-b383bd659a070932ded94d4bd6fbcdc884c3f79f.tar.xz | |
when the video codec is mpeg4video copy the content of the esds in extradata; patch by ceyes ag or at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22172 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index a16857048c..29d7423f96 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -91,6 +91,7 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, 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 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, 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; |