summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-02 20:05:44 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-02 20:05:44 +0000
commit2d1e1c0334f611ad2ae597c218449cf739476c05 (patch)
tree0456e843828a8da29f963f9290577ef2dde46ead /libmpdemux
parent7b7529400348aefd90cf3f937de975e55e3a295e (diff)
downloadmpv-2d1e1c0334f611ad2ae597c218449cf739476c05.tar.bz2
mpv-2d1e1c0334f611ad2ae597c218449cf739476c05.tar.xz
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
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/open.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 5bf5b86a25..081d5c1684 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -526,6 +526,7 @@ if(strncmp("dvd://",filename,6) == 0){
#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 @@ if(strncmp("dvd://",filename,6) == 0){
mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname );
url_free(url);
return stream;
+// }
}
}
#endif