X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fflac.c;h=9e0b97f69e9e8b7efb0717a19f4578ffc8f6f309;hb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;hp=b1b8e883466078998a41d4e4add5aa037f95ed85;hpb=24eee4b8f2941ab42a9f02bc2c0b80ad4255a2be;p=vlc

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index b1b8e88346..9e0b97f69e 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -84,7 +84,7 @@ struct decoder_sys_t
 
     } stream_info;
 #endif
-    vlc_bool_t b_stream_info;
+    bool b_stream_info;
 
     /*
      * Common properties
@@ -221,7 +221,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     /* Misc init */
     aout_DateSet( &p_sys->end_date, 0 );
     p_sys->i_state = STATE_NOSYNC;
-    p_sys->b_stream_info = VLC_FALSE;
+    p_sys->b_stream_info = false;
     p_sys->p_block=NULL;
     p_sys->bytestream = block_BytestreamInit();
 
@@ -316,7 +316,7 @@ static void CloseDecoder( vlc_object_t *p_this )
     FLAC__stream_decoder_delete( p_sys->p_flac );
 #endif
 
-    if( p_sys->p_block ) free( p_sys->p_block );
+    free( p_sys->p_block );
     free( p_sys );
 }
 
@@ -687,7 +687,7 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder,
              p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_rate,
              p_dec->fmt_out.audio.i_bitspersample );
 
-    p_sys->b_stream_info = VLC_TRUE;
+    p_sys->b_stream_info = true;
     p_sys->stream_info = metadata->data.stream_info;
 
     return;
@@ -832,9 +832,9 @@ static int SyncInfo( decoder_t *p_dec, uint8_t *p_buf,
     int i_blocksize = 0, i_blocksize_hint = 0, i_sample_rate_hint = 0;
     uint64_t i_sample_number = 0;
 
-    vlc_bool_t b_variable_blocksize = ( p_sys->b_stream_info &&
+    bool b_variable_blocksize = ( p_sys->b_stream_info &&
         p_sys->stream_info.min_blocksize != p_sys->stream_info.max_blocksize );
-    vlc_bool_t b_fixed_blocksize = ( p_sys->b_stream_info &&
+    bool b_fixed_blocksize = ( p_sys->b_stream_info &&
         p_sys->stream_info.min_blocksize == p_sys->stream_info.max_blocksize );
 
     /* Check syncword */
@@ -1337,7 +1337,7 @@ static void CloseEncoder( vlc_object_t *p_this )
 
     FLAC__stream_encoder_delete( p_sys->p_flac );
 
-    if( p_sys->p_buffer ) free( p_sys->p_buffer );
+    free( p_sys->p_buffer );
     free( p_sys );
 }