mirror of https://github.com/mpv-player/mpv
If asf/tcp fails, asf/http used a wrong port
Fixes mms://mms.thestreet.com/cramer011205.wma git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14526 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
9d25ccf484
commit
aa3d2fd97a
|
@ -50,6 +50,7 @@ int
|
||||||
asf_streaming_start( stream_t *stream, int *demuxer_type) {
|
asf_streaming_start( stream_t *stream, int *demuxer_type) {
|
||||||
char *proto = stream->streaming_ctrl->url->protocol;
|
char *proto = stream->streaming_ctrl->url->protocol;
|
||||||
int fd = -1;
|
int fd = -1;
|
||||||
|
int port = stream->streaming_ctrl->url->port;
|
||||||
|
|
||||||
// Is protocol even valid mms,mmsu,mmst,http,http_proxy?
|
// Is protocol even valid mms,mmsu,mmst,http,http_proxy?
|
||||||
if (!(!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mmsu", 4) ||
|
if (!(!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mmsu", 4) ||
|
||||||
|
@ -75,6 +76,7 @@ asf_streaming_start( stream_t *stream, int *demuxer_type) {
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
|
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
|
||||||
fd = asf_mmst_streaming_start( stream );
|
fd = asf_mmst_streaming_start( stream );
|
||||||
|
stream->streaming_ctrl->url->port = port;
|
||||||
if( fd>-1 ) return fd;
|
if( fd>-1 ) return fd;
|
||||||
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
|
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
|
||||||
if( fd==-2 ) return -1;
|
if( fd==-2 ) return -1;
|
||||||
|
@ -86,6 +88,7 @@ asf_streaming_start( stream_t *stream, int *demuxer_type) {
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
|
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
|
||||||
fd = asf_http_streaming_start( stream, demuxer_type );
|
fd = asf_http_streaming_start( stream, demuxer_type );
|
||||||
|
stream->streaming_ctrl->url->port = port;
|
||||||
if( fd>-1 ) return fd;
|
if( fd>-1 ) return fd;
|
||||||
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
|
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
|
||||||
if( fd==-2 ) return -1;
|
if( fd==-2 ) return -1;
|
||||||
|
|
Loading…
Reference in New Issue