# HG changeset patch # User reimar # Date 1352553518 0 # Node ID ebcf337f17866126132f28ae05edc60390244fb0 # Parent 7b3815b8238d20ce0e80123a0451ea159121bc21 Remove proxy "support" from stream_rtp and stream_upd, trying to use a http proxy for UDP connections makes no sense. diff -r 7b3815b8238d -r ebcf337f1786 stream/stream_rtp.c --- a/stream/stream_rtp.c Sat Nov 10 13:13:29 2012 +0000 +++ b/stream/stream_rtp.c Sat Nov 10 13:18:38 2012 +0000 @@ -71,18 +71,15 @@ static int rtp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { - URL_t *url; - mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_RTP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new (); if (!stream->streaming_ctrl) return STREAM_ERROR; stream->streaming_ctrl->bandwidth = network_bandwidth; - url = url_new (stream->url); - stream->streaming_ctrl->url = check4proxies (url); + stream->streaming_ctrl->url = url_new(stream->url); - if (url->port == 0) + if (stream->streaming_ctrl->url->port == 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "You must enter a port number for RTP streams!\n"); diff -r 7b3815b8238d -r ebcf337f1786 stream/stream_udp.c --- a/stream/stream_udp.c Sat Nov 10 13:13:29 2012 +0000 +++ b/stream/stream_udp.c Sat Nov 10 13:18:38 2012 +0000 @@ -63,18 +63,15 @@ static int udp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { - URL_t *url; - mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_UDP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new (); if (!stream->streaming_ctrl) return STREAM_ERROR; stream->streaming_ctrl->bandwidth = network_bandwidth; - url = url_new (stream->url); - stream->streaming_ctrl->url = check4proxies (url); + stream->streaming_ctrl->url = url_new(stream->url); - if (url->port == 0) + if (stream->streaming_ctrl->url->port == 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "You must enter a port number for UDP streams!\n");