summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-15 08:47:55 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-15 08:47:55 +0000
commite4b5ff6cf0a5ecc476971349b34c5e3e177914d0 (patch)
tree9b3f2e426bd73b76fb0dbf02cd17eadad826e876 /libmpdemux
parent9afb8b3073affe16e2bbb8d64f427a5ec250f363 (diff)
downloadmpv-e4b5ff6cf0a5ecc476971349b34c5e3e177914d0.tar.bz2
mpv-e4b5ff6cf0a5ecc476971349b34c5e3e177914d0.tar.xz
ftp is handled by the modular stream manager
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15479 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/open.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 33cdbfd57b..baccdd3abc 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -464,6 +464,7 @@ if(strncmp("dvd://",filename,6) == 0){
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 @@ 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);
@@ -520,7 +520,6 @@ if(strncmp("dvd://",filename,6) == 0){
return stream;
}
}
- }
#endif
//============ Open STDIN or plain FILE ============