[MPlayer-cvslog] CVS: main/libmpdemux open.c,1.104,1.105

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	open.c 
Log Message:
ftp is handled by the modular stream manager

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- open.c	15 May 2005 07:38:42 -0000	1.104
+++ open.c	15 May 2005 08:47:55 -0000	1.105
@@ -464,6 +464,7 @@
     strncmp("cdda://", filename, 7) && strncmp("cddb://", filename, 7) &&
     strncmp("mpst://", filename, 7) && strncmp("tivo://", filename, 7) &&
     strncmp("file://", filename, 7) && strncmp("cue://", filename, 6) &&
+    strncmp("ftp://", filename, 6) &&
     strstr(filename, "://")) {
      url = url_new(filename);
     }
@@ -507,7 +508,6 @@
 #endif
 	}
         stream=new_stream(f,STREAMTYPE_STREAM);
-    if (strcmp(url->protocol, "ftp")) { // ftp is handled somewhere else
 	if( streaming_start( stream, file_format, url )<0){
           mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename);
 	  url_free(url);
@@ -520,7 +520,6 @@
 	return stream;
 	}
   }
-  }
 #endif
 
 //============ Open STDIN or plain FILE ============