diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 20:19:33 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 20:19:33 +0000 |
| commit | d4197da915f73c2c565b36223ba49e96b66ef108 (patch) | |
| tree | d86eacc1b3961106f9c95b9652ed92ae081ba56d /libmpdemux/demux_rtp.cpp | |
| parent | ee38afc1ad03c30ce98f98c0605739b892145b70 (diff) | |
| download | mpv-d4197da915f73c2c565b36223ba49e96b66ef108.tar.bz2 mpv-d4197da915f73c2c565b36223ba49e96b66ef108.tar.xz | |
- 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@live.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7144 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_rtp.cpp')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index f8454fc849..7d934017f6 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -111,7 +111,7 @@ extern "C" void demux_open_rtp(demuxer_t* demuxer) { 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 @@ extern "C" void demux_close_rtp(demuxer_t* demuxer) { // 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) { |