Commit 7b5cd1f8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '593-lib_enc-ivas_stereo_eclvq_enc-c-should-include-stl-h-instead-of-basop32-h' into 'main'

Resolve "lib_enc/ivas_stereo_eclvq_enc.c: Should include stl.h instead of basop32.h"

See merge request !813
parents 95f19b82 3d3b81c2

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */





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

lib_enc/ivas_stereo_eclvq_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -41,7 +41,11 @@ 
#include "prot.h"

#include "wmc_auto.h"

/* used only for norm_s in the code_length_from_count function */

#ifdef FIX_593_STL_INCLUDE

#include "stl.h"

#else

#include "basop32.h"

#endif





/*---------------------------------------------------------------