Commit 77c8f31b authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1747-fix-options-h-defines-with-prefix-merge_request' into 'main' 

Resolve "Fix options.h defines with prefix MERGE_REQUEST"

Closes #1747

See merge request !1777
parents ae217967 1876a824

lib_dec/ivas_dirac_output_synthesis_cov_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


*******************************************************************************************************/



#define MERGE_REQUEST_1564_SPEEDUP_ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx_NONBE



#include <stdint.h>

#include <string.h>

lib_enc/ivas_mc_param_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ static void ivas_param_mc_param_est_enc_fx( 
#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

            set64_fx( Cy_sum_imag_64[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

#else

            set32_fx( Cy_sum_fx[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

            set16_fx( Cy_sum_e[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

            set32_fx( Cy_sum_imag_fx[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

            set16_fx( Cy_sum_imag_e[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

#endif

        }