Commit 6bb39394 authored by vaclav's avatar vaclav
Browse files

fix merge

parent 4b966f8d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 
#define HARM_PREPROC                                    /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX  */

#define HARM_NON_LINEARITY                              /* VA: basop issue 2345: Remove duplicated code in core-coder: non_linearity_fx() and LP CNG */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

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

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */



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