Commit 26ecc3ee authored by sagnowski's avatar sagnowski
Browse files

Fix merge error

parent c7a2a6aa

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -4002,7 +4002,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples 
            }



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            if ( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, nSamplesToRender, pcmType, pcm_buffer_offset( pcmBuf, pcmType, *nSamplesRendered * nOutChannels ), &nSamplesRendered_loop, &tmp ) ) != IVAS_ERR_OK )

            if ( splitRendBits != NULL )

            {

                /* Render head poses from time-scaled transport channels */

                if ( ( error = isar_render_poses( hIvasDec, nSamplesToRender, &nSamplesRendered_loop, &tmp ) ) != IVAS_ERR_OK )