diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-01 14:18:06 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-01 14:18:06 +0000 |
commit | 147aa0219a7900ec2e907c8cb5d1267259d2d363 (patch) | |
tree | cb5a9c4e567b99f4f8f1475db0ebddbd1022ba33 | |
parent | 381682bc97df92cd1802adcee06813bc45193a3f (diff) | |
download | mpv-147aa0219a7900ec2e907c8cb5d1267259d2d363.tar.bz2 mpv-147aa0219a7900ec2e907c8cb5d1267259d2d363.tar.xz |
new rtsp-destination option which allows forcing destination ip address (fixes some issues with some reluctant rtsp servers)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18879 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-common.h | 4 | ||||
-rw-r--r-- | libmpdemux/librtsp/rtsp_rtp.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index e01cb9674d..484cb38f23 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -74,7 +74,8 @@ {"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, - + {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, + // ------------------------- demuxer options -------------------- // number of frames to play/convert @@ -416,6 +417,7 @@ extern int flip_hebrew; extern int rtspStreamOverTCP; #endif extern int rtsp_port; +extern char *rtsp_destination; extern int audio_stream_cache; diff --git a/libmpdemux/librtsp/rtsp_rtp.c b/libmpdemux/librtsp/rtsp_rtp.c index c623ac1753..42dfe3cc3d 100644 --- a/libmpdemux/librtsp/rtsp_rtp.c +++ b/libmpdemux/librtsp/rtsp_rtp.c @@ -74,6 +74,7 @@ #define RTCP_SEND_FREQUENCY 1024 int rtsp_port = 0; +char *rtsp_destination = NULL; void rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st) @@ -656,7 +657,10 @@ rtp_setup_and_play (rtsp_t *rtsp_session) } /* now check network settings as determined by server */ - destination = parse_destination (answer); + if (rtsp_destination) + destination = strdup (rtsp_destination); + else + destination = parse_destination (answer); if (!destination) destination = strdup (server_addr); free (server_addr); |