[MPlayer-cvslog] r25415 - trunk/stream/asf_streaming.c

[ben]

Author: ben
Date: Sat Dec 15 20:16:49 2007
New Revision: 25415

Log:
do not override *file_format if already set by asf_streaming_start()
ASX files containing a playlist were probably not playable at all.

Fixes playback of the following:
http://www.impek.com/go/oldcartoontv/wm
http://www.impek.tv/go/soul/wm
http://www.impek.com/go/tropical2/wm
http://www.impek.com/go/mizik/wm

--This line, and those below, will be 
ignored--

M    stream/asf_streaming.c


Modified:
   trunk/stream/asf_streaming.c

Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c	(original)
+++ trunk/stream/asf_streaming.c	Sat Dec 15 20:16:49 2007
@@ -864,6 +864,7 @@ static int open_s(stream_t *stream,int m
 		return STREAM_UNSUPPORTED;
 	}
 	
+	if (*file_format != DEMUXER_TYPE_PLAYLIST)
 	*file_format = DEMUXER_TYPE_ASF;
 	stream->type = STREAMTYPE_STREAM;
 	fixup_network_stream_cache(stream);