# HG changeset patch # User rtognimp # Date 1083528344 0 # Node ID 45595c6fbe0a5a214c3d31fb16d8047e241259f3 # Parent adfd98f1abf7985638a0932686db4ac56b124d9f Restore ftp support (was erroneusly disabled while fixing bogus errors on conection failure) diff -r adfd98f1abf7 -r 45595c6fbe0a libmpdemux/open.c --- a/libmpdemux/open.c Sun May 02 17:09:05 2004 +0000 +++ b/libmpdemux/open.c Sun May 02 20:05:44 2004 +0000 @@ -526,6 +526,7 @@ #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); @@ -534,6 +535,7 @@ mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname ); url_free(url); return stream; +// } } } #endif