[Mplayer-cvslog] CVS: main/libmpdemux open.c, 1.90, 1.91 network.c, 1.93, 1.94 demuxer.c, 1.161, 1.162

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	open.c network.c demuxer.c 
Log Message:
Respect -playlist for asx streams
Patch by adland


Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- open.c	3 Sep 2003 19:26:33 -0000	1.90
+++ open.c	17 Apr 2004 16:46:40 -0000	1.91
@@ -115,7 +115,12 @@
 stream_t* stream=NULL;
 int f=-1;
 off_t len;
-*file_format = DEMUXER_TYPE_UNKNOWN;
+
+  // Check if playlist or unknown 
+  if (*file_format != DEMUXER_TYPE_PLAYLIST){
+    *file_format=DEMUXER_TYPE_UNKNOWN;
+  }
+
 if(!filename) {
    mp_msg(MSGT_OPEN,MSGL_ERR,"NULL filename, report this bug\n");
    return NULL;

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- network.c	14 Apr 2004 20:45:25 -0000	1.93
+++ network.c	17 Apr 2004 16:46:40 -0000	1.94
@@ -1168,7 +1168,13 @@
 		return -1;
 	}
 	stream->streaming_ctrl->url = check4proxies( url );
+
+        if (*demuxer_type != DEMUXER_TYPE_PLAYLIST){ 
 	ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type );
+        } else {
+	  ret=0;
+	}
+
 	if( ret<0 ) {
 		return -1;
 	}

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- demuxer.c	12 Apr 2004 14:19:12 -0000	1.161
+++ demuxer.c	17 Apr 2004 16:46:40 -0000	1.162
@@ -1377,7 +1377,7 @@
 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){
   stream_t *as = NULL,*ss = NULL;
   demuxer_t *vd,*ad = NULL,*sd = NULL;
-  int afmt = 0,sfmt = 0;
+  int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ;
 
   if(audio_stream) {
     as = open_stream(audio_stream,0,&afmt);