Mercurial > mplayer.hg

changeset 16326:88b9c7b0e773

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 739c473493d2
children 6c2a8a87d540
files libmpdemux/demux_mov.c libmpdemux/demuxer.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Wed Aug 31 09:24:44 2005 +0000
+++ b/libmpdemux/demux_mov.c	Wed Aug 31 13:04:22 2005 +0000
@@ -506,7 +506,7 @@
     free(priv);
 
     if ((flags==5) || (flags==7)) // reference & header sent
-        return DEMUXER_TYPE_MOV;
+        return DEMUXER_TYPE_PLAYLIST;
 
     if(flags==1)
 	mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing data (mdat) chunk! Maybe broken file...\n");
--- 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,