diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-13 02:58:57 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-13 02:58:57 +0000 |
| commit | 6e9cbdc10448203e7c8b2de41447442fcc9f7bae (patch) | |
| tree | 0ed465592509105fdbeab27fc12ddbb2e3590aa5 /libmpdemux/demux_rtp_codec.cpp | |
| parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
| download | mpv-6e9cbdc10448203e7c8b2de41447442fcc9f7bae.tar.bz2 mpv-6e9cbdc10448203e7c8b2de41447442fcc9f7bae.tar.xz | |
whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_rtp_codec.cpp')
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 35dbe3fb95..839da403ca 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -82,7 +82,7 @@ parseQTState_video(QuickTimeGenericRTPSource::QTState const& qtState, static Boolean parseQTState_audio(QuickTimeGenericRTPSource::QTState const& qtState, unsigned& fourcc, unsigned& numChannels); // forward - + static BITMAPINFOHEADER * insertVideoExtradata(BITMAPINFOHEADER *bih, unsigned char * extraData, unsigned size) @@ -111,7 +111,7 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, sh_video->bih = bih; demux_stream_t* d_video = demuxer->video; d_video->sh = sh_video; sh_video->ds = d_video; - + // Map known video MIME types to the BITMAPINFOHEADER parameters // that this program uses. (Note that not all types need all // of the parameters to be set.) @@ -187,11 +187,11 @@ 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) && fourcc==mmioFOURCC('a','v','c','1') || - !memcmp(pos+4, "esds", 4) || + if ((!memcmp(pos+4, "avcC", 4) && fourcc==mmioFOURCC('a','v','c','1') || + !memcmp(pos+4, "esds", 4) || !memcmp(pos+4, "SMI ", 4) && fourcc==mmioFOURCC('S','V','Q','3')) && atomLength > 8) { - sh_video->bih = bih = + sh_video->bih = bih = insertVideoExtradata(bih, pos+8, atomLength-8); break; } @@ -217,7 +217,7 @@ void rtpCodecInitialize_audio(demuxer_t* demuxer, demux_stream_t* d_audio = demuxer->audio; d_audio->sh = sh_audio; sh_audio->ds = d_audio; d_audio->id = sh_audio->aid; - + wf->nChannels = subsession->numChannels(); // Map known audio MIME types to the WAVEFORMATEX parameters @@ -358,7 +358,7 @@ static void needVideoFrameRate(demuxer_t* demuxer, sh_video->frametime = 1.0f/fps; return; } - + // Keep looking at incoming frames until we see two with different, // non-zero "pts" timestamps: unsigned char* packetData; unsigned packetDataLen; |