Mercurial > mplayer.hg

changeset 35300:ebcf337f1786

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove proxy "support" from stream_rtp and stream_upd, trying to use a http proxy for UDP connections makes no sense.
author reimar
date Sat, 10 Nov 2012 13:18:38 +0000
parents 7b3815b8238d
children 8f6d3f8ffa61
files stream/stream_rtp.c stream/stream_udp.c
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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");
--- 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");