Commit a516f54e authored by multrus's avatar multrus
Browse files

Merge branch '2074_ref_portFltMr2158_compilerWarning' into 'ivas-float-update' 

Port Flt MR 2158 to ivas-float-update - Resolve "Warnings with gcc 12.2.0 (Debian 12)"

See merge request !2329
parents 1e53e736 246a89f0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#define FIX_1053_REVERB_RECONFIGURATION

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mdct_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -951,10 +951,14 @@ void ivas_mdct_core_reconstruct( 
        /* Postfiltering */

        post_decoder( st, synth_buf, pit_gain[ch], pitch[ch], x[ch][0], st->p_bpf_noise_buf );



#ifndef FIX_938_COMPILER_WARNING

        if ( signal_outFB[ch] )

        {

#endif

            mvr2r( synthFB, signal_outFB[ch], st->hTcxDec->L_frameTCX );

#ifndef FIX_938_COMPILER_WARNING

        }

#endif



#ifdef DEBUG_PLC_INFO

        {