Mercurial > mplayer.hg

changeset 15478:868fa16142df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ftp is handled by the modular stream manager
author nicodvb
date Sun, 15 May 2005 08:47:55 +0000
parents 15f012150986
children 1efe604c0eba
files libmpdemux/open.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/open.c	Sun May 15 07:59:30 2005 +0000
+++ b/libmpdemux/open.c	Sun May 15 08:47:55 2005 +0000
@@ -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 ============