summaryrefslogtreecommitdiffstats
path: root/libmpdemux/network.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-17 16:46:41 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-17 16:46:41 +0000
commite3daf3ca75f6a596ec6b6e5b08b73389407a58d2 (patch)
tree95ae172c6716a1fe35ce98219547a3fa8216ba8c /libmpdemux/network.c
parent83744e1bca75219173170bd6323597aa775625e6 (diff)
downloadmpv-e3daf3ca75f6a596ec6b6e5b08b73389407a58d2.tar.bz2
mpv-e3daf3ca75f6a596ec6b6e5b08b73389407a58d2.tar.xz
Respect -playlist for asx streams
Patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/network.c')
-rw-r--r--libmpdemux/network.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index 4b41876b5d..731b0d098f 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -1168,7 +1168,13 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
return -1;
}
stream->streaming_ctrl->url = check4proxies( url );
+
+ if (*demuxer_type != DEMUXER_TYPE_PLAYLIST){
ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type );
+ } else {
+ ret=0;
+ }
+
if( ret<0 ) {
return -1;
}