Commit 8f8e5ba3 authored by Stefan Doehla's avatar Stefan Doehla
Browse files

[fix] merge conflicts

parent 11c21a34

lib_com/common_api_types.h

+0 −3
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ typedef struct _IVAS_JBM_TRACE_DATA 


} IVAS_JBM_TRACE_DATA;



<<<<<<< HEAD

#ifdef IVAS_RTPDUMP

typedef struct

{
@@ -236,7 +235,6 @@ typedef struct 
    IVAS_QUATERNION deviceOrientationQuat;

} PI_DATA_DEPACKER_STATE;

#endif

=======

typedef enum _ivas_binaural_renderer_type

{

    IVAS_BIN_RENDERER_TYPE_NONE,
@@ -247,7 +245,6 @@ typedef enum _ivas_binaural_renderer_type 
    IVAS_BIN_RENDERER_TYPE_DEFAULT,



} IVAS_BIN_RENDERER_TYPE;

>>>>>>> main



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

 * Split rendering API constants, structures, and enums

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -2435,7 +2435,7 @@ bool IVAS_isImmersiveFormat( 
        return false;

    }

    return true;



}

#endif



#ifdef DEBUGGING