# HG changeset patch # User ben # Date 1197746209 0 # Node ID 95893c0e5108c3996a4bbe4fee65db2cece0d171 # Parent bd46b759fd3588eabc5d321a3f7a10e691aa0b94 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 diff -r bd46b759fd35 -r 95893c0e5108 stream/asf_streaming.c --- a/stream/asf_streaming.c Sat Dec 15 17:10:06 2007 +0000 +++ b/stream/asf_streaming.c Sat Dec 15 19:16:49 2007 +0000 @@ -864,6 +864,7 @@ return STREAM_UNSUPPORTED; } + if (*file_format != DEMUXER_TYPE_PLAYLIST) *file_format = DEMUXER_TYPE_ASF; stream->type = STREAMTYPE_STREAM; fixup_network_stream_cache(stream);