Commit 95d8483e authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

add compilation switch

parent ae302da5

lib_dec/fd_cng_dec_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -134,12 +134,18 @@ void initFdCngDec_ivas_fx( 
    set16_fx( hFdCngDec->msPsd, 0, NPART_SHAPING );

    set32_fx( hFdCngDec->msPsd_fx, 0, NPART_SHAPING );

<<<<<<< HEAD

<<<<<<< HEAD

#ifdef FIX_2245_INIT_FD_CNG_EVS

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

#endif

=======

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

>>>>>>> 5c78c00f1 (commit the actual fix)

=======

#ifdef FIX_2245_INIT_FD_CNG_EVS

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

#endif

>>>>>>> fbf0056f4 (add compilation switch)

    set32_fx( hFdCngDec->msNoiseFloor_32fx, 0, NPART_SHAPING );



    set32_fx( hFdCngDec->msNoiseEst, 0, NPART_SHAPING );