summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-12 09:29:13 +0000
committerrsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-12 09:29:13 +0000
commit7badc92c2a3a067278f6ef07c0d876a5e156e68b (patch)
treeb7afd92945e9803463f37001df6a871001aabf2f /libmpdemux
parent6efe31cb1211bdd47191762107d08816970e3ecb (diff)
downloadmpv-7badc92c2a3a067278f6ef07c0d876a5e156e68b.tar.bz2
mpv-7badc92c2a3a067278f6ef07c0d876a5e156e68b.tar.xz
Minor code cleanup.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp_codec.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 6e7c66c1fd..4d58824594 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -196,7 +196,7 @@ static void needVideoFrameRate(demuxer_t* demuxer,
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 @@ static void needVideoFrameRate(demuxer_t* demuxer,
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.