Commit 023ef3dd authored by multrus's avatar multrus
Browse files

fix merge problem from MR2179

parent 4b5038ee

lib_dec/ivas_cpe_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -653,7 +653,11 @@ ivas_error ivas_cpe_dec_fx( 


        IF( NE_16( shift, 31 ) )

        {

#ifdef FIX_1946_CRASH_JBM_PROCESSING

            shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q17 ); /* Q17 for guard bits */

#else

            shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q16 ); /* Q16 for guard bits */

#endif



            IF( GT_16( shift, hCPE->hStereoDft->q_dft ) )

            {