diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-15 19:16:49 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-15 19:16:49 +0000 |
| commit | 1fd811a4876d642152e843be4ca4198502e39bd8 (patch) | |
| tree | c9267e262c344fc87270f7c15b9be0ac8c0d6e78 /stream | |
| parent | 8f186a3535a4e833d34288e33fc2ff55c3f36024 (diff) | |
| download | mpv-1fd811a4876d642152e843be4ca4198502e39bd8.tar.bz2 mpv-1fd811a4876d642152e843be4ca4198502e39bd8.tar.xz | |
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
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/asf_streaming.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |