Mercurial > mplayer.hg

changeset 25387:95893c0e5108

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author ben
date Sat, 15 Dec 2007 19:16:49 +0000
parents bd46b759fd35
children 57c207e33831
files stream/asf_streaming.c
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);