[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp.cpp,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv19771

Modified Files:
	demux_rtp.cpp 
Log Message:
- Tell the RTSP client code to use the string "mplayer" in RTSP
"User-Agent:" fields.  NOTE: This requires an up-to-date version of the
LIVE.COM Streaming Media libraries.
- Fix a bug that could cause mplayer to crash on exit if a "rtsp://" URL was bad.
patch by Ross Finlayson <finlayson at live.com>


Index: demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demux_rtp.cpp	14 Aug 2002 21:56:31 -0000	1.2
+++ demux_rtp.cpp	29 Aug 2002 20:19:33 -0000	1.3
@@ -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,7 @@
 
   // 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) {