# HG changeset patch # User nicodvb # Date 1116146875 0 # Node ID 868fa16142dfcd66f1fd1a6d4d9d2beb4126a174 # Parent 15f0121509864699cd4ec69b3973213dfccc3dd6 ftp is handled by the modular stream manager diff -r 15f012150986 -r 868fa16142df libmpdemux/open.c --- 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 ============