[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.94,1.95

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv1925

Modified Files:
	open.c 
Log Message:
Restore ftp support (was erroneusly disabled while fixing bogus errors 
on conection failure)


Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- open.c	1 May 2004 23:35:25 -0000	1.94
+++ open.c	2 May 2004 20:05:44 -0000	1.95
@@ -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