Commit 392467ec authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744_step2_tables_and_bin_update_nonBE

parents 30c1250c 99ef80a0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ 
#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

#define FIX_WARNING_RENDER_CONFIG

#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

#define FIX_938_GCC_12_WARNINGS                         /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */



/* #################### End BE switches ################################## */

lib_enc/enc_higher_acelp.c

+2 −0
Original line number Diff line number Diff line
@@ -242,8 +242,10 @@ void transf_cdbk_enc( 
        x_tran[i] = (float) ( x_norm[i] );

    }



#ifndef FIX_938_GCC_12_WARNINGS

    set_f( x_tran + Nsv * WIDTH_BAND, 0.0f, L_SUBFR - WIDTH_BAND * Nsv );



#endif

    if ( st->coder_type != INACTIVE && st->core_brate >= MIN_BRATE_AVQ_EXC && st->core_brate <= MAX_BRATE_AVQ_EXC_TD && !harm_flag_acelp )

    {

        mvr2r( x_tran, code_preQ, L_SUBFR );