From 1fd811a4876d642152e843be4ca4198502e39bd8 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 15 Dec 2007 19:16:49 +0000 Subject: 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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25415 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/asf_streaming.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream') diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 40ec466b55..9aba5c2a2c 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -864,6 +864,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_UNSUPPORTED; } + if (*file_format != DEMUXER_TYPE_PLAYLIST) *file_format = DEMUXER_TYPE_ASF; stream->type = STREAMTYPE_STREAM; fixup_network_stream_cache(stream); -- cgit v1.2.3