X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fa52.c;h=fc675a52df3fbbc78e74950c1e6eb3be5dfd6f51;hb=67a55f9c6be8d6cb905a201ffe8d40f89032d7af;hp=378f8e62dc22c0108d1ff3684e6f509b7a3dff18;hpb=57bbabb5e7c4b33141fdfbd811c78120e2401a9f;p=vlc diff --git a/modules/demux/a52.c b/modules/demux/a52.c index 378f8e62dc..fc675a52df 100644 --- a/modules/demux/a52.c +++ b/modules/demux/a52.c @@ -28,7 +28,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -45,7 +46,7 @@ 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_description( N_("Raw A/52 demuxer") ); set_capability( "demux", 145 ); set_callbacks( Open, Close ); add_shortcut( "a52" ); @@ -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 */