Commit 585490f5 authored by vaclav's avatar vaclav
Browse files

fix merge issue causing a build failure

parent 7dddc5d5

lib_com/ivas_error.h

+12 −7
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ typedef enum 
    IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,

#ifdef DEBUGGING

    IVAS_ERR_INVALID_FORCE_MODE,

#ifdef EXT_RENDERER

    IVAS_ERR_NUM_CHANNELS_UNKNOWN,

    IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT,

    IVAS_ERR_INVALID_INPUT_ID,

    IVAS_ERR_WRONG_NUM_CHANNELS,

    IVAS_ERR_INVALID_BUFFER_SIZE,

#endif

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

    IVAS_ERR_INVALID_AGC,

#endif
@@ -129,6 +122,18 @@ typedef enum 
    IVAS_ERR_BITSTREAM_READER_INVALID_DATA,

    IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,



#ifdef EXT_RENDERER

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

     *    renderer (lib_rend only)            *

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



    IVAS_ERR_NUM_CHANNELS_UNKNOWN,

    IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT,

    IVAS_ERR_INVALID_INPUT_ID,

    IVAS_ERR_WRONG_NUM_CHANNELS,

    IVAS_ERR_INVALID_BUFFER_SIZE,

#endif



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

     *              unknown error             *

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