Grr, really fix ts-extra-pmt comment.

[vlc] / modules / codec / spudec / spudec.c

diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c
index 540f864f05a08d76a6d5f0d5604ffd1413199ed9..5f4e83e3e7455ad650b0a109cf5ff884ab120983 100644 (file)
--- a/modules/codec/spudec/spudec.c
+++ b/modules/codec/spudec/spudec.c
@@ -25,7 +25,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
 
 #include "spudec.h"
@@ -38,14 +43,14 @@ static int  PacketizerOpen( vlc_object_t * );
 static void Close         ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("DVD subtitles decoder") );
+    set_description( N_("DVD subtitles decoder") );
     set_capability( "decoder", 50 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_SCODEC );
     set_callbacks( DecoderOpen, Close );
 
     add_submodule();
-    set_description( _("DVD subtitles packetizer") );
+    set_description( N_("DVD subtitles packetizer") );
     set_capability( "packetizer", 50 );
     set_callbacks( PacketizerOpen, Close );
 vlc_module_end();
@@ -76,7 +81,7 @@ static int DecoderOpen( vlc_object_t *p_this )
 
     p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
 
-    p_sys->b_packetizer = VLC_FALSE;
+    p_sys->b_packetizer = false;
     p_sys->i_spu_size = 0;
     p_sys->i_spu      = 0;
     p_sys->p_block    = NULL;
@@ -104,7 +109,7 @@ static int PacketizerOpen( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     p_dec->pf_packetize  = Packetize;
-    p_dec->p_sys->b_packetizer = VLC_TRUE;
+    p_dec->p_sys->b_packetizer = true;
     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
     p_dec->fmt_out.i_codec = VLC_FOURCC( 's','p','u',' ' );
 
@@ -149,7 +154,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     block_ChainRelease( p_spu_block );
 
     /* Parse and decode */
-    p_spu = E_(ParsePacket)( p_dec );
+    p_spu = ParsePacket( p_dec );
 
     /* reinit context */
     p_sys->i_spu_size = 0;
@@ -201,7 +206,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
         ( p_block->i_pts <= 0 || p_block->i_buffer < 4 ) )
     {
         msg_Dbg( p_dec, "invalid starting packet (size < 4 or pts <=0)" );
-        msg_Dbg( p_dec, "spu size: %d, i_pts: "I64Fd" i_buffer: %d",
+        msg_Dbg( p_dec, "spu size: %d, i_pts: %"PRId64" i_buffer: %zu",
                  p_sys->i_spu_size, p_block->i_pts, p_block->i_buffer );
         block_Release( p_block );
         return NULL;