Mercurial > mplayer.hg
changeset 18874:57bb217e71a4
new rtsp-destination option which allows forcing destination ip address (fixes some issues with some reluctant rtsp servers)
| author | ben |
|---|---|
| date | Sat, 01 Jul 2006 14:18:06 +0000 |
| parents | f974a20a7543 |
| children | caa2724bd743 |
| files | cfg-common.h libmpdemux/librtsp/rtsp_rtp.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sat Jul 01 12:06:43 2006 +0000 +++ b/cfg-common.h Sat Jul 01 14:18:06 2006 +0000 @@ -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 rtspStreamOverTCP; #endif extern int rtsp_port; +extern char *rtsp_destination; extern int audio_stream_cache;
--- a/libmpdemux/librtsp/rtsp_rtp.c Sat Jul 01 12:06:43 2006 +0000 +++ b/libmpdemux/librtsp/rtsp_rtp.c Sat Jul 01 14:18:06 2006 +0000 @@ -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 @@ } /* 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);