X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fdemuxdump.c;h=0d507820438adf5390c1b1b2064f7ccde1497fae;hb=27d483e9ef7a451397d7857251c8d67097661f1d;hp=bca13a5fa5697d3198894125109ca380374de041;hpb=806cf5165824be921bf2402ecf11fd3ee6501f9c;p=vlc

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index bca13a5fa5..0d50782043 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -26,7 +26,12 @@
  *****************************************************************************/
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
@@ -48,12 +53,12 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("File dumper") );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
-              FILE_LONGTEXT, VLC_FALSE );
+              FILE_LONGTEXT, false );
+        change_unsafe();
     add_bool( "demuxdump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT,
-              VLC_FALSE );
-        change_safe();
+              false );
     set_callbacks( Open, Close );
     add_shortcut( "dump" );
 vlc_module_end();
@@ -89,7 +94,7 @@ static int Open( vlc_object_t * p_this )
     demux_sys_t *p_sys;
     const char  *psz_mode;
     vlc_value_t val;
-    vlc_bool_t  b_append;
+    bool  b_append;
 
     /* Accept only if forced */
     if( !p_demux->b_force )
@@ -142,7 +147,7 @@ static void Close( vlc_object_t *p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file,
+    msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file,
               p_sys->i_write / 1024 );
 
     if( p_sys->p_file != stdout )
@@ -191,6 +196,6 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
 }