Commit 8f3bb1fa authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 00f8f73c

apps/decoder.c

+4 −4
Original line number Diff line number Diff line
@@ -2408,7 +2408,7 @@ static ivas_error decodeG192( 
                    }

                }



                /* decode transport channels, do TSM and feed to renderer */

                /* Decode transport channels, do TSM and feed to renderer */

                if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )

                {

                    return error;
@@ -2461,10 +2461,10 @@ static ivas_error decodeG192( 
                    fprintf( stderr, "\nError in IVAS_DEC_GetSamplesRenderer(): %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

            }



            nSamplesRendered += nSamplesRendered_loop;

            nSamplesToRender -= nSamplesRendered_loop;

            }



            if ( needNewFrame )

            {

apps/isar_post_rend.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
*******************************************************************************************************/



#include "lib_isar_post_rend.h"





#include <assert.h>

#include <math.h>

#include <string.h>