[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp_codec.cpp,1.3,1.4
Ross Finlayson CVS
rsf at mplayerhq.hu
Sat Apr 12 11:29:37 CEST 2003
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv10519
Modified Files:
demux_rtp_codec.cpp
Log Message:
Minor code cleanup.
Index: demux_rtp_codec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp_codec.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_rtp_codec.cpp 11 Mar 2003 19:08:31 -0000 1.3
+++ demux_rtp_codec.cpp 12 Apr 2003 09:29:13 -0000 1.4
@@ -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.
More information about the MPlayer-cvslog
mailing list