Commit 7ef57f61 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix build failures from merge

parent 8b68502d

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -3270,11 +3270,7 @@ static ivas_error decodeVoIP( 
    int16_t nSamplesFlushed = 0;



    /* decode and get samples */

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nError in IVAS_DEC_VoIP_Flush: %s\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ ivas_error IVAS_DEC_Flush( 
    if ( nSamplesToRender > 0 && hIvasDec->st_ivas->ivas_format != MONO_FORMAT )

    {

#endif

        error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmBuf );

        error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmType, pcmBuf );

#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE

    }

    else