diff options
| author | rsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-11 02:35:01 +0000 |
|---|---|---|
| committer | rsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-11 02:35:01 +0000 |
| commit | 208d38b876aef637eaaea5d3e382aec4a6f890bc (patch) | |
| tree | ca8026aebfbc7e78d3752b10a4d5f64ecd31c2d3 /libmpdemux | |
| parent | 23e0f24f27bb070bb45d5feddb451ea131de89bf (diff) | |
| download | mpv-208d38b876aef637eaaea5d3e382aec4a6f890bc.tar.bz2 mpv-208d38b876aef637eaaea5d3e382aec4a6f890bc.tar.xz | |
Access-controlled RTSP sessions can now be played, if the user uses the
"-user" and "-passwd" options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9905 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 3aeb9334d6..e83bf2414e 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -94,6 +94,8 @@ typedef struct RTPState { struct timeval firstSyncTime; }; +extern "C" char* network_username; +extern "C" char* network_password; int rtspStreamOverTCP = 0; extern "C" void demux_open_rtp(demuxer_t* demuxer) { @@ -124,7 +126,15 @@ extern "C" void demux_open_rtp(demuxer_t* demuxer) { break; } - sdpDescription = rtspClient->describeURL(url); + // If we were given a user name (and optional password), then use them: + if (network_username != NULL) { + char const* password + = network_password == NULL ? "" : network_password; + sdpDescription + = rtspClient->describeWithPassword(url, network_username, password); + } else { + sdpDescription = rtspClient->describeURL(url); + } if (sdpDescription == NULL) { fprintf(stderr, "Failed to get a SDP description from URL \"%s\": %s\n", url, env->getResultMsg()); @@ -306,6 +316,7 @@ Boolean insertRTPData(demuxer_t* demuxer, demux_stream_t* ds, dp->len = dataLen; dp->pts = 0; bufferQueue->savePendingBuffer(dp); + return True; } static void teardownRTSPSession(RTPState* rtpState); // forward |