Commit 7bb676a2 authored by vaclav's avatar vaclav
Browse files

fix merge

parent bb5e6bb9

lib_dec/ivas_init_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas ); 
static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order );

#endif



static ivas_error ivas_dec_reconfig_split_rend( Decoder_Struct *st_ivas );



#ifdef NONBE_FIX_1052_SBA_EXT

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order )