Commit 62e4d91e authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Resolved conflict

parent c02378e6

apps/decoder.c

+1 −3
Original line number Diff line number Diff line
@@ -3272,14 +3272,12 @@ static ivas_error decodeVoIP( 
    int16_t vec_pos_update, vec_pos_len;

    int16_t nOutSamples = 0;



<<<<<<< HEAD

#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO

    char rxBuffer[SOCKET_BUFFER_SIZE];

=======

#endif

#ifdef OBJ_EDITING_API

    bool parameterAvailableForEditing = false;

    uint16_t nSamplesRendered = 0;

>>>>>>> main

#endif



    vec_pos_update = 0;