Commit 69348058 authored by vaclav's avatar vaclav
Browse files

fix merging

parent 4145cb5b
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4116,7 +4116,7 @@ static ivas_error ivas_dec_voip_get_samples_common(
        {
#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR
#ifndef DISABLE_LIMITER
            ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, st_ivas->hDecoderConfig->nchan_out, st_ivas->BER_detect );
            ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );
#endif
#else
            if ( st_ivas->hDecoderConfig->render_num_subframes == IVAS_RENDER_NUM_SUBFR_5MS )