Fix commit [a0a315c850c037a71e4bf8fd854bb6c671af4e02]

[vlc] / modules / demux / a52.c

diff --git a/modules/demux/a52.c b/modules/demux/a52.c
index dd0c5e3a70cfec76ad94efa2de49a976a7bb448f..fc675a52df3fbbc78e74950c1e6eb3be5dfd6f51 100644 (file)
--- a/modules/demux/a52.c
+++ b/modules/demux/a52.c
@@ -28,7 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>
 
@@ -45,8 +46,8 @@ static void Close ( vlc_object_t * );
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("Raw A/52 demuxer") );
-    set_capability( "demux2", 145 );
+    set_description( N_("Raw A/52 demuxer") );
+    set_capability( "demux", 145 );
     set_callbacks( Open, Close );
     add_shortcut( "a52" );
 vlc_module_end();
@@ -83,7 +84,7 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    const byte_t*p_peek;
+    const uint8_t *p_peek;
     int         i_peek = 0;
     bool  b_big_endian = 0; /* Arbitrary initialisation */
 
@@ -197,7 +198,7 @@ static int Demux( demux_t *p_demux )
 
 #else
         int i;
-        byte_t *p_tmp, tmp;
+        uint8_t *p_tmp, tmp;
         p_tmp = p_block_in->p_buffer;
         for( i = p_block_in->i_buffer / 2 ; i-- ; )
         {
@@ -227,7 +228,7 @@ static int Demux( demux_t *p_demux )
             if( p_block_out->i_length )
             {
                 p_sys->i_mux_rate =
-                    p_block_out->i_buffer * I64C(1000000)/p_block_out->i_length;
+                    p_block_out->i_buffer * INT64_C(1000000)/p_block_out->i_length;
             }
 
             /* set PCR */
@@ -260,7 +261,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     }
     else
     {
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        8*p_sys->i_mux_rate, 1, i_query, args );
     }