# HG changeset patch # User rsf # Date 1050139753 0 # Node ID 41ed68e3a034c5ed0be73dcce3ca62957232945d # Parent dab2b1d95244d1a92044720841fd167aafafa186 Minor code cleanup. diff -r dab2b1d95244 -r 41ed68e3a034 libmpdemux/demux_rtp_codec.cpp --- a/libmpdemux/demux_rtp_codec.cpp Fri Apr 11 17:38:51 2003 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Sat Apr 12 09:29:13 2003 +0000 @@ -196,7 +196,7 @@ extern float force_fps; if (force_fps != 0.0) return; // user used "-fps" demux_stream_t* d_video = demuxer->video; - sh_video_t* sh_video = (sh_video_t*)(demuxer->video->sh); + sh_video_t* sh_video = (sh_video_t*)(d_video->sh); // If we already know the subsession's video frame rate, use it: int fps = (int)(subsession->videoFPS()); @@ -211,8 +211,9 @@ float lastPTS = 0.0, curPTS; unsigned const maxNumFramesToWaitFor = 100; for (unsigned i = 0; i < maxNumFramesToWaitFor; ++i) { - if (!awaitRTPPacket(demuxer, demuxer->video, - packetData, packetDataLen, curPTS)) break; + if (!awaitRTPPacket(demuxer, d_video, packetData, packetDataLen, curPTS)) { + break; + } if (curPTS > lastPTS && lastPTS != 0.0) { // Use the difference between these two "pts"s to guess the frame rate.