[MPlayer-cvslog] CVS: main/libmpdemux asf_streaming.c,1.51,1.52

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv19322

Modified Files:
	asf_streaming.c 
Log Message:
If asf/tcp fails, asf/http used a wrong port
Fixes mms://mms.thestreet.com/cramer011205.wma


Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- asf_streaming.c	28 Dec 2004 11:16:23 -0000	1.51
+++ asf_streaming.c	16 Jan 2005 22:30:28 -0000	1.52
@@ -50,6 +50,7 @@
 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 even valid mms,mmsu,mmst,http,http_proxy?
     if (!(!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mmsu", 4) ||
@@ -75,6 +76,7 @@
     {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
 		fd = asf_mmst_streaming_start( stream );
+		stream->streaming_ctrl->url->port = port;
 		if( fd>-1 ) return fd;
 		mp_msg(MSGT_NETWORK,MSGL_V,"  ===> ASF/TCP failed\n");
 		if( fd==-2 ) return -1;
@@ -86,6 +88,7 @@
     {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
 		fd = asf_http_streaming_start( stream, demuxer_type );
+		stream->streaming_ctrl->url->port = port;
 		if( fd>-1 ) return fd;
 		mp_msg(MSGT_NETWORK,MSGL_V,"  ===> ASF/HTTP failed\n");
 		if( fd==-2 ) return -1;