Restore ftp support (was erroneusly disabled while fixing bogus errors

on conection failure)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12399 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rtognimp 2004-05-02 20:05:44 +00:00
parent 7b75294003
commit 2d1e1c0334
1 changed files with 2 additions and 0 deletions

View File

@ -526,6 +526,7 @@ if(strncmp("dvd://",filename,6) == 0){
#endif #endif
} }
stream=new_stream(f,STREAMTYPE_STREAM); stream=new_stream(f,STREAMTYPE_STREAM);
// if (strcmp(url->protocol, "ftp")) { // ftp is handled somewhere else
if( streaming_start( stream, file_format, url )<0){ if( streaming_start( stream, file_format, url )<0){
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename); mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename);
url_free(url); url_free(url);
@ -534,6 +535,7 @@ if(strncmp("dvd://",filename,6) == 0){
mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname ); mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname );
url_free(url); url_free(url);
return stream; return stream;
// }
} }
} }
#endif #endif