implemented the display device selector.

[vlc] / modules / access / ftp.c

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 2e12d8e8eb1502134547985ad5daaf706f506ed5..8138995d4685180db8ab1106c5787b633b11cee6 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -26,6 +26,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 #include <assert.h>
@@ -95,7 +99,7 @@ vlc_module_end();
 static ssize_t Read( access_t *, uint8_t *, size_t );
 static ssize_t Write( sout_access_out_t *, block_t * );
 static int Seek( access_t *, int64_t );
-static int OutSeek( sout_access_out_t *, int64_t );
+static int OutSeek( sout_access_out_t *, off_t );
 static int Control( access_t *, int, va_list );
 
 struct access_sys_t
@@ -619,7 +623,7 @@ static int ftp_ReadCommand( vlc_object_t *p_access, access_sys_t *p_sys,
     if( psz_line == NULL || strlen( psz_line ) < 3 )
     {
         msg_Err( p_access, "cannot get answer" );
-        if( psz_line ) free( psz_line );
+        free( psz_line );
         if( pi_answer ) *pi_answer    = 500;
         if( ppsz_answer ) *ppsz_answer  = NULL;
         return -1;
@@ -664,7 +668,7 @@ static int ftp_ReadCommand( vlc_object_t *p_access, access_sys_t *p_sys,
 }
 
 static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys,
-                            off_t i_start )
+                            int64_t i_start )
 {
     char psz_ipv4[16], *psz_ip = p_sys->sz_epsv_ip;
     int  i_answer;