* modules/mux/mpeg/*: should fix builtin compilation

 * modules/access/ftp.c : an ftp access, buggy but it begins to work.
The main issue is about password confidentiality so you must know
what you are doing :((

AUTHORS

@@ -9,8 +9,13 @@
 N: Laurent Aimar
 E: fenrir@via.ecp.fr
 C: fenrir
-D: AVI demultiplexer
-D: MPEG-4, Div & OpenDivX decoder (ffmpeg)
+D: avi, asf/wmv/wma, mp4/mov, mp3, aac, wav demultiplexers
+D: MPEG-4, Div & OpenDivX and various decoders (ffmpeg)
+D: AAC decoder (libfaad2)
+D: cinepak, adpcm, araw decoders
+D: Subtile file parser.
+D: mms, ftp access
+D: Stream output
 S: France
 
 N: Marc Ariberti
@@ -369,6 +374,7 @@ N: Eric Petit
 E: titer@videolan.org
 C: titer
 D: BeOS module fixes and enhancements
+D: Stream output
 S: France
 
 N: Olivier Pomel

configure.ac.in

@@ -135,6 +135,7 @@ case "x${target_os}" in
         LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32"
         LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lws2_32"
         LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
+        LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
         LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
         LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
         LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
@@ -273,6 +274,7 @@ AC_CHECK_FUNC(send,,[
     LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
     LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket"
     LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
+    LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket"
     LDFLAGS_sap="${LDFLAGS_sap} -lsocket"
     LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket"
 )])
@@ -697,7 +699,7 @@ PLUGINS="${PLUGINS} aout_file"
 PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
 PLUGINS="${PLUGINS} id3 m3u"
 PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm"
-PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap"
+PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap access_ftp"
 
 dnl
 dnl  Accelerated modules

modules/access/Modules.am

@@ -2,3 +2,4 @@ SOURCES_access_file = modules/access/file.c
 SOURCES_access_udp = modules/access/udp.c
 SOURCES_access_http = modules/access/http.c
 SOURCES_access_rtp = modules/access/rtp.c
+SOURCES_access_ftp = modules/access/ftp.c

modules/mux/mpeg/pes.c

@@ -2,7 +2,7 @@
  * pes.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: pes.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $
+ * $Id: pes.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -46,11 +46,11 @@
 #include "pes.h"
 #include "bits.h"
 
-int EStoPES( sout_instance_t *p_sout,
-             sout_buffer_t **pp_pes,
-             sout_buffer_t *p_es,
-             int i_stream_id,
-             int b_mpeg2 )
+int E_( EStoPES )( sout_instance_t *p_sout,
+                   sout_buffer_t **pp_pes,
+                   sout_buffer_t *p_es,
+                   int i_stream_id,
+                   int b_mpeg2 )
 {
     sout_buffer_t *p_pes;
     bits_buffer_t bits;

modules/mux/mpeg/pes.h

@@ -2,7 +2,7 @@
  * pes.h
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: pes.h,v 1.1 2002/12/14 21:32:41 fenrir Exp $
+ * $Id: pes.h,v 1.2 2002/12/15 23:39:41 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -33,6 +33,6 @@
 #define PES_ITU_T_H222_1_TYPE_E_STREAM  0xf8
 
 
-int EStoPES( sout_instance_t *p_sout,
-             sout_buffer_t **pp_pes, sout_buffer_t *p_es, 
-             int i_stream_id, int b_mpeg2 );
+int E_( EStoPES )( sout_instance_t *p_sout,
+                   sout_buffer_t **pp_pes, sout_buffer_t *p_es, 
+                   int i_stream_id, int b_mpeg2 );

modules/mux/mpeg/ps.c

@@ -2,7 +2,7 @@
  * ps.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ps.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $
+ * $Id: ps.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -350,7 +350,7 @@ static int Mux      ( sout_instance_t *p_sout )
         }
 
         p_data = sout_FifoGet( p_fifo );
-        EStoPES( p_sout, &p_data, p_data, p_stream->i_stream_id, 1);
+        E_( EStoPES )( p_sout, &p_data, p_data, p_stream->i_stream_id, 1);
         p_sout->pf_write( p_sout, p_data );
 
         p_mux->i_pes_count++;

modules/mux/mpeg/ts.c

@@ -2,7 +2,7 @@
  * ts.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ts.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $
+ * $Id: ts.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -566,7 +566,7 @@ static int Mux( sout_instance_t *p_sout )
         i_dts    = p_data->i_dts;
         i_length = p_data->i_length;
 
-        EStoPES( p_sout, &p_data, p_data, p_stream->i_stream_id, 1);
+        E_( EStoPES )( p_sout, &p_data, p_data, p_stream->i_stream_id, 1);
         PEStoTS( p_sout, &p_data, p_data, p_stream );
 
         if( p_mux->i_ts_packet % 30 == 0 )