Commit 970f47ae authored by multrus's avatar multrus
Browse files

Merge branch '1338-declaration-definition-mismatch-for-ivas_error-stereo_dft_dec_main' into 'main' 

Resolve "Declaration/definition mismatch for ivas_error stereo_dft_dec_main()"

See merge request !2157
parents e5c6f952 fb17a63f

lib_dec/ivas_cpe_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void read_stereo_mode_and_bwidth( CPE_DEC_HANDLE hCPE, const Decoder_Stru 


static void stereo_mode_combined_format_dec( const Decoder_Struct *st_ivas, CPE_DEC_HANDLE hCPE );



static ivas_error stereo_dft_dec_main( CPE_DEC_HANDLE hCPE, const int32_t ivas_total_brate, const int16_t n_channels, float res_buf[STEREO_DFT_N_8k], float *output[], float outputHB[][L_FRAME48k], const int16_t output_frame );

static ivas_error stereo_dft_dec_main( CPE_DEC_HANDLE hCPE, const int32_t ivas_total_brate, const int16_t n_channels, float *p_res_buf, float *output[], float outputHB[][L_FRAME48k], const int16_t output_frame );





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