path: root/stream
diff options
authorupsuper <upsuper@b3059339-0415-0410-9bf9-f77b7e298cf2>2012-11-06 15:53:41 +0000
committerwm4 <wm4@nowhere>2012-11-20 18:00:14 +0100
commit7759e565b725382d201f6bd0a49982b4d7d39a11 (patch)
treed9377e4fa8f4c70695201a0be7156c2654f3e5e0 /stream
parent3f85094d4e3d7d0ab0dcc088ecaa2ccf9d55bb68 (diff)
asf_streaming: remove broken MMSU support code
Comment out unused code git-svn-id: svn:// b3059339-0415-0410-9bf9-f77b7e298cf2 Removing mmsu-related code MMSU was never supported by MPlayer, and the protocol has been deprecated. Since the code is not in use at all, Removing it should not break anything. git-svn-id: svn:// b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
1 files changed, 3 insertions, 15 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index e7ca8468db..5e34f53d4c 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -64,30 +64,18 @@ static int asf_read_wrapper(int fd, void *buffer, int len, streaming_ctrl_t *str
// We can try several protocol for asf streaming
-// * first the UDP protcol, if there is a firewall, UDP
-// packets will not come back, so the mmsu will fail.
-// * Then we can try TCP, but if there is a proxy for
+// * First we can try TCP, but if there is a proxy for
// internet connection, the TCP connection will not get
// through
// * Then we can try HTTP.
-// Note: Using WMP sequence MMSU then MMST and then HTTP.
+// Note: Using WMP sequence MMST and then HTTP.
static int asf_streaming_start( stream_t *stream, int *demuxer_type) {
char *proto = stream->streaming_ctrl->url->protocol;
int fd = -1;
int port = stream->streaming_ctrl->url->port;
- // Is protocol mms or mmsu?
- if (!strcasecmp(proto, "mmsu") || !strcasecmp(proto, "mms"))
- {
- mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
- //fd = asf_mmsu_streaming_start( stream );
- if( fd>-1 ) return fd; //mmsu support is not implemented yet - using this code
- mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/UDP failed\n");
- if( fd==-2 ) return -1;
- }
//Is protocol mms or mmst?
if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
@@ -861,7 +849,7 @@ const stream_info_t stream_info_asf = {
"Bertrand, Reimar Doeffinger, Albeu",
"originally based on work by Majormms (is that code still there?)",
- {"mms", "mmsu", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
+ {"mms", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
0 // Urls are an option string