[MPlayer-dev-eng] Re: [PATCH] Some minor patches (for RTSP/RTP streaming)
Ross Finlayson
finlayson at live.com
Fri Aug 30 19:17:27 CEST 2002
>That's still bad. Use "cvs diff -u mplayer.c" etc.
OK, sorry about that. I hope this is OK:
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.549
diff -u -r1.549 mplayer.c
--- mplayer.c 21 Aug 2002 21:31:18 -0000 1.549
+++ mplayer.c 30 Aug 2002 17:17:34 -0000
@@ -1032,7 +1032,7 @@
}
#endif
-if(stream_dump_type==5){
+if(stream_dump_type==5 && stream->fd >= 0){
unsigned char buf[4096];
int len;
FILE *f;
Index: libmpdemux/demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.2
diff -u -r1.2 demux_rtp.cpp
--- libmpdemux/demux_rtp.cpp 14 Aug 2002 21:56:31 -0000 1.2
+++ libmpdemux/demux_rtp.cpp 30 Aug 2002 17:19:10 -0000
@@ -111,7 +111,7 @@
char const* url = demuxer->stream->streaming_ctrl->url->url;
extern int verbose;
- rtspClient = RTSPClient::createNew(*env, verbose);
+ rtspClient = RTSPClient::createNew(*env, verbose, "mplayer");
if (rtspClient == NULL) {
fprintf(stderr, "Failed to create RTSP client: %s\n",
env->getResultMsg());
@@ -310,6 +310,8 @@
// Get the RTP state that was stored in the demuxer's 'priv' field:
RTPState* rtpState = (RTPState*)(demuxer->priv);
+ if (rtpState == NULL) return;
+
UsageEnvironment* env = NULL;
TaskScheduler* scheduler = NULL;
if (rtpState->mediaSession != NULL) {
More information about the MPlayer-dev-eng
mailing list