Commit 1c735b19 authored by vaclav's avatar vaclav
Browse files

Merge branch '719-decoder-crashes-after-call-to-goto-to-cleanup' into 'main' 

Resolve "Decoder crashes after call to goto to cleanup"

See merge request !988
parents 0fc9528d 8d858ac3

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 
#define OSBA_SPLIT_RENDERING

#endif



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





/* ################## End BE DEVELOPMENT 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;

    }