Commit 8d46420d authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into b_20230817_jbm-for-osba

parents 7c32b517 1c735b19

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ 


#define JBM_FOR_OSBA



#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */



/* ################## End BE DEVELOPMENT switches ######################### */



/* #################### Start NON-BE CR switches ########################## */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2438,7 +2438,11 @@ void ivas_initialize_handles_dec( 
    st_ivas->hJbmMetadata = NULL;



    /*  floating-point output audio buffers */

#ifdef FIX_719_CRASH_IN_CLEANUP

    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

#else

    for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

#endif

    {

        st_ivas->p_output_f[i] = NULL;

    }