X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=32de839e5c608191f1a8e331112b9b0468f739fa;hb=d5017d216e822924c59edcf7e3b4dab27df9ce84;hp=844507a5d9492a7efd67e475049e327bec8e2329;hpb=70a8bb9649c3e44350d0fd579c24b8a9ddd7af34;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 844507a5d9..32de839e5c 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -26,6 +26,10 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -40,7 +44,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -79,7 +83,7 @@ static int OpenPacketizer( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); static void *DecodeBlock ( decoder_t *, block_t ** ); -static int SyncInfo ( const byte_t *, unsigned int *, unsigned int *, +static int SyncInfo ( const uint8_t *, unsigned int *, unsigned int *, unsigned int *, int * ); static uint8_t *GetOutBuffer ( decoder_t *, void ** ); @@ -125,11 +129,11 @@ static int OpenDecoder( vlc_object_t *p_this ) } /* Misc init */ - p_sys->b_packetizer = VLC_FALSE; + p_sys->b_packetizer = false; p_sys->i_state = STATE_NOSYNC; aout_DateSet( &p_sys->end_date, 0 ); - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->bytestream = block_BytestreamInit(); p_sys->i_input_rate = INPUT_RATE_DEFAULT; /* Set output properties */ @@ -152,7 +156,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) int i_ret = OpenDecoder( p_this ); - if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; + if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true; return i_ret; } @@ -298,7 +302,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SEND_DATA: if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) { - //p_dec->b_error = VLC_TRUE; + //p_dec->b_error = true; return NULL; } @@ -425,7 +429,7 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) * since we don't want to oblige S/PDIF people to use liba52 just to get * their SyncInfo... *****************************************************************************/ -static int SyncInfo( const byte_t * p_buf, +static int SyncInfo( const uint8_t * p_buf, unsigned int * pi_channels, unsigned int * pi_channels_conf, unsigned int * pi_sample_rate, int * pi_bit_rate )