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

resolve conflicts

parent de129555

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -98,14 +98,11 @@ 
#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define FIX_2294_CLANG_18_WARNINGS_ENC                  /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

<<<<<<< HEAD

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */

=======

#define OPT_BE_2311_HARM_GSC_GAIN                       /* VA: issue 2311: BE part of the GSC gain harmonization pipeline #70380 shows the BE */

#define HARM_CORECODER_UPDT                             /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */

#define HARM_CORE_SW                                    /* VA: basop issue 2314: Remove duplicated code in the core switching */

#define HARM_PREPROC                                    /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX  */

>>>>>>> origin

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */



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