Commit b00423d6 authored by vaclav's avatar vaclav
Browse files

revert some formal changes

parent ed57f99c

lib_dec/ivas_init_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static ivas_error ivas_read_format( Decoder_Struct *st_ivas, int16_t *num_bits_r 


static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );





#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER

/*-------------------------------------------------------------------*

 * ivas_set_audio_config_from_sba_order()
@@ -67,6 +68,9 @@ static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( 
)

#else

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order );





static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order )

#endif

{

    AUDIO_CONFIG output_config;
@@ -435,6 +439,7 @@ ivas_error ivas_dec_setup( 
#endif

            st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );

        }



#endif

        if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == SBA_FORMAT )

        {