More clean up on subtitle.

[vlc] / modules / misc / dummy / decoder.c

diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c
index 8f31c72829f7e2ae73e7ef8c2603fa17015cc53e..d02ae31746e482e9e4025df9e0ef94c548c6cf4e 100644 (file)
--- a/modules/misc/dummy/decoder.c
+++ b/modules/misc/dummy/decoder.c
@@ -24,7 +24,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_codec.h>
 
 #ifdef HAVE_UNISTD_H
@@ -42,11 +46,8 @@
 #   include <fcntl.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
-#   include <limits.h> /* PATH_MAX */
-#endif
+#include <limits.h> /* PATH_MAX */
 
-#include <stdio.h> /* sprintf() */
 
 #include "dummy.h"
 
@@ -66,7 +67,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block );
 /*****************************************************************************
  * OpenDecoder: Open the decoder
  *****************************************************************************/
-int E_(OpenDecoder) ( vlc_object_t *p_this )
+int OpenDecoder ( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys;
@@ -134,7 +135,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         write( p_sys->i_fd, p_block->p_buffer, p_block->i_buffer );
 #endif
 
-        msg_Dbg( p_dec, "dumped %i bytes", p_block->i_buffer );
+        msg_Dbg( p_dec, "dumped %zu bytes", p_block->i_buffer );
     }
 
     block_Release( p_block );
@@ -144,7 +145,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 /*****************************************************************************
  * CloseDecoder: decoder destruction
  *****************************************************************************/
-void E_(CloseDecoder) ( vlc_object_t *p_this )
+void CloseDecoder ( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys = p_dec->p_sys;