Commit 7a2a54c2 authored by Vidhya V P's avatar Vidhya V P
Browse files

Resolving merge conflicts

parent 87b7ddc8

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −3
Original line number Diff line number Diff line
@@ -3579,12 +3579,9 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( 
    const uint8_t slotEnd,

    const uint8_t nBins,

#endif

<<<<<<< HEAD

=======

#ifdef JBM_TSM_ON_TCS

    const int16_t nSlots,

#endif

>>>>>>> main

    float Rmat[3][3] )

{

#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS