[Mplayer-cvslog] CVS: main playtreeparser.c, 1.25, 1.26 mencoder.c, 1.240, 1.241 asxparser.c, 1.12, 1.13

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	playtreeparser.c mencoder.c asxparser.c 
Log Message:
Respect -playlist for asx streams
Patch by adland


Index: playtreeparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/playtreeparser.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- playtreeparser.c	1 Apr 2004 22:11:28 -0000	1.25
+++ playtreeparser.c	17 Apr 2004 16:46:39 -0000	1.26
@@ -15,6 +15,7 @@
 #include "playtree.h"
 #include "playtreeparser.h"
 #include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
 #include "mp_msg.h"
 
 
@@ -518,7 +519,7 @@
 
 play_tree_t*
 embedded_playlist_parse(char *line) {
-  int f;
+  int f=DEMUXER_TYPE_PLAYLIST;
   stream_t* stream;
   play_tree_parser_t* ptp;
   play_tree_t* entry;
@@ -646,7 +647,7 @@
 parse_playlist_file(char* file) {
   stream_t *stream;
   play_tree_t* ret;
-  int f;
+  int f=DEMUXER_TYPE_PLAYLIST;
 
   stream = open_stream(file,0,&f);
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- mencoder.c	7 Apr 2004 12:46:14 -0000	1.240
+++ mencoder.c	17 Apr 2004 16:46:40 -0000	1.241
@@ -337,7 +337,7 @@
 sh_audio_t *sh_audio=NULL;
 sh_video_t *sh_video=NULL;
 int file_format=DEMUXER_TYPE_UNKNOWN;
-int i;
+int i=DEMUXER_TYPE_UNKNOWN;
 void *vobsub_writer=NULL;
 
 uint32_t ptimer_start;

Index: asxparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/asxparser.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- asxparser.c	9 Jul 2003 01:29:44 -0000	1.12
+++ asxparser.c	17 Apr 2004 16:46:40 -0000	1.13
@@ -9,6 +9,7 @@
 #include "playtree.h"
 #include "playtreeparser.h"
 #include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
 #include "asxparser.h"
 #include "mp_msg.h"
 #include "m_config.h"
@@ -506,7 +507,7 @@
   char *href;
   stream_t* stream;
   play_tree_parser_t* ptp;
-  int f;
+  int f=DEMUXER_TYPE_UNKNOWN;
 
   if(parser->deep > 0)
     return NULL;