Mercurial > mplayer.hg

diff libmpdemux/demuxer.c @ 16326:88b9c7b0e773
Fix move playlists (control must be returned to mplayer.c, with the demuxer returning the real URL as a packet).
author: reimar
date: Wed, 31 Aug 2005 13:04:22 +0000
parents: efbfac98cab1
children: 6ff303d2876b
--- a/libmpdemux/demuxer.c	Wed Aug 31 09:24:44 2005 +0000
+++ b/libmpdemux/demuxer.c	Wed Aug 31 13:04:22 2005 +0000
@@ -629,6 +629,8 @@
         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 @@
         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,