Commit f18f1d14 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fixed conflict

parent 44dac0aa

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -97,15 +97,12 @@ 
#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */

#define FIX_BASOP_2546_HARMONIZE_TCX_SCALAR             /* FhG: Fix issue 2546 Harmonize function tcx_scalar_quantization_rateloop*/

#define FIX_BASOP_2532_cx_e                             /* FhG: Fix issue 2532 about additional exponent variable*/

<<<<<<< HEAD

#define HARMONIZE_2553_TonalConceal_Apply               /* FhG: Harmonize TonalMDCTConceal_Apply with its ivas derivate */

=======

#define HARMONIZE_2543_SQ_gain                          /* FhG: Harmonize SQ_gain */

#define FIX_ISSUE_2533_EXTRA_CONDITION                  /* FhG: Fix issue basop 2533 removing the extra condition*/

#define HARMONIZE_2537_SetTCXModeInfo                 /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */

#define HARMONIZE_2537_GetTCXMaxenergyChange            /* FhG: Harmonize GetTCXMaxenergyChange */

#define HARMONIZE_2508_InitTransientDetection          /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas  */

>>>>>>> 387619a8bfc0565d9cee80a5363566403e32f107



/* #################### End BE switches ################################## */