* modules/codec/ffmpeg: experimental muxer using ffmpeg's libavformat.

modules/codec/ffmpeg/Modules.am

@@ -8,6 +8,7 @@ SOURCES_ffmpeg = \
 	encoder.c \
 	postprocess.c \
 	demux.c \
+	mux.c \
 	$(NULL)
 
 SOURCES_ffmpegaltivec = \
@@ -20,5 +21,6 @@ SOURCES_ffmpegaltivec = \
 	encoder.c \
 	postprocess.c \
 	demux.c \
+	mux.c \
 	$(NULL)
 

modules/codec/ffmpeg/demux.c

@@ -74,7 +74,7 @@ static int Demux  ( demux_t *p_demux );
 static int Control( demux_t *p_demux, int i_query, va_list args );
 
 static int IORead( void *opaque, uint8_t *buf, int buf_size );
-static int IOSeek( void *opaque, offset_t offset, int whence );
+static offset_t IOSeek( void *opaque, offset_t offset, int whence );
 
 /*****************************************************************************
  * Open
@@ -439,7 +439,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size )
     return i_ret ? i_ret : -1;
 }
 
-static int IOSeek( void *opaque, offset_t offset, int whence )
+static offset_t IOSeek( void *opaque, offset_t offset, int whence )
 {
     URLContext *p_url = opaque;
     demux_t *p_demux = p_url->priv_data;

modules/codec/ffmpeg/ffmpeg.c

@@ -191,6 +191,12 @@ vlc_module_begin();
     set_capability( "demux2", 2 );
     set_callbacks( E_(OpenDemux), E_(CloseDemux) );
 
+    /* mux submodule */
+    add_submodule();
+    set_description( _("FFmpeg muxer" ) );
+    set_capability( "sout mux", 2 );
+    set_callbacks( E_(OpenMux), E_(CloseMux) );
+
     /* video filter submodule */
     add_submodule();
     set_capability( "video filter2", 50 );

modules/codec/ffmpeg/ffmpeg.h

@@ -68,6 +68,10 @@ void E_(CloseAudioEncoder)( vlc_object_t * );
 int  E_(OpenDemux) ( vlc_object_t * );
 void E_(CloseDemux)( vlc_object_t * );
 
+/* Mux module */
+int  E_(OpenMux) ( vlc_object_t * );
+void E_(CloseMux)( vlc_object_t * );
+
 /* Video filter module */
 int  E_(OpenFilter)( vlc_object_t * );
 int  E_(OpenCropPadd)( vlc_object_t * );