From e1d1e3bc747d1fef403ff02a85b46ea259932f59 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 31 Aug 2005 13:04:22 +0000 Subject: Fix move playlists (control must be returned to mplayer.c, with the demuxer returning the real URL as a packet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8f9c0cf35a..505291a8e7 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -629,6 +629,8 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { file_format = fformat; break; } else { + if (fformat == DEMUXER_TYPE_PLAYLIST) + return demuxer; // handled in mplayer.c // Format changed after check, recurse free_demuxer(demuxer); demuxer=demux_open_stream(stream, fformat, force, @@ -672,6 +674,8 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { file_format = fformat; break; } else { + if (fformat == DEMUXER_TYPE_PLAYLIST) + return demuxer; // handled in mplayer.c // Format changed after check, recurse free_demuxer(demuxer); demuxer=demux_open_stream(stream, fformat, force, -- cgit v1.2.3