Mercurial > mplayer.hg

changeset 12398:45595c6fbe0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore ftp support (was erroneusly disabled while fixing bogus errors on conection failure)
author rtognimp
date Sun, 02 May 2004 20:05:44 +0000
parents adfd98f1abf7
children 9403b245fcda
files libmpdemux/open.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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