[MPlayer-cvslog] r35394 - in trunk/stream: stream_rtp.c stream_udp.c

[reimar]

Author: reimar
Date: Sat Nov 10 14:18:38 2012
New Revision: 35394

Log:
Remove proxy "support" from stream_rtp and stream_upd, trying
to use a http proxy for UDP connections makes no sense.

Modified:
   trunk/stream/stream_rtp.c
   trunk/stream/stream_udp.c

Modified: trunk/stream/stream_rtp.c
==============================================================================
--- trunk/stream/stream_rtp.c	Sat Nov 10 14:13:29 2012	(r35393)
+++ trunk/stream/stream_rtp.c	Sat Nov 10 14:18:38 2012	(r35394)
@@ -71,18 +71,15 @@ rtp_streaming_start (stream_t *stream)
 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");

Modified: trunk/stream/stream_udp.c
==============================================================================
--- trunk/stream/stream_udp.c	Sat Nov 10 14:13:29 2012	(r35393)
+++ trunk/stream/stream_udp.c	Sat Nov 10 14:18:38 2012	(r35394)
@@ -63,18 +63,15 @@ udp_streaming_start (stream_t *stream)
 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");