Commit 2af426d9 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '605-lib_enc-lib_enc-c-leftovers-of-bitstream_indices_memory' into 'main' 

[BE] Resolve "lib_enc/lib_enc.c: Leftovers of BITSTREAM_INDICES_MEMORY"

See merge request !825
parents 5ee82f66 c72483b2

lib_enc/lib_enc.c

+0 −12
Original line number Diff line number Diff line
@@ -110,13 +110,7 @@ ivas_error IVAS_ENC_Open( 
     * Allocate and initialize IVAS application encoder handle

     *-----------------------------------------------------------------*/



#ifdef BITSTREAM_INDICES_MEMORY

#define WMC_TOOL_SKIP

    if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )

#undef WMC_TOOL_SKIP

#else

    if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )

#endif

    {

        return IVAS_ERR_FAILED_ALLOC;

    }
@@ -205,13 +199,7 @@ void IVAS_ENC_Close( 


    ( *phIvasEnc )->st_ivas = NULL;



#ifdef BITSTREAM_INDICES_MEMORY

#define WMC_TOOL_SKIP

    free( *phIvasEnc );

#undef WMC_TOOL_SKIP

#else

    free( *phIvasEnc );

#endif



    *phIvasEnc = NULL;

    phIvasEnc = NULL;