[MPlayer-cvslog] CVS: main/libmpdemux demux_mov.c, 1.127, 1.128 demuxer.c, 1.200, 1.201

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv21247

Modified Files:
	demux_mov.c demuxer.c 
Log Message:
Fix move playlists (control must be returned to mplayer.c, with the demuxer
returning the real URL as a packet).


Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- demux_mov.c	30 Aug 2005 23:24:47 -0000	1.127
+++ demux_mov.c	31 Aug 2005 13:04:22 -0000	1.128
@@ -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");

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- demuxer.c	30 Aug 2005 23:56:23 -0000	1.200
+++ demuxer.c	31 Aug 2005 13:04:22 -0000	1.201
@@ -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,