Commit 2e20403c authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

fix

parent 7c3aaeff

apps/decoder.c

+7 −1
Original line number Diff line number Diff line
@@ -1878,12 +1878,17 @@ static ivas_error initOnFirstGoodFrame( 
                    return error;

                }

            }

<<<<<<< HEAD

<<<<<<< HEAD



            if ( !isSplitCoded )

=======

            else

>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)

=======

            

            if ( !isSplitCoded )

>>>>>>> 245a6d7b0 (fix)

            {

                if ( *pRemainingDelayNumSamples < *numOutSamples )

                {
@@ -3384,7 +3389,8 @@ static ivas_error decodeVoIP( 
                    goto cleanup;

                }

            }

            else

            

            if ( !isSplitCoded )

            {

                if ( delayNumSamples < nOutSamples )

                {