Commit ad0e5b9b authored by fotopoulou's avatar fotopoulou
Browse files

fix conflict

parent cc7eaa7b
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@
/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_1283_STEREO_DFT_COLLAPSE                    /* FhG: issue 1283: fix for critical issue with DFT stereo core coder */

/* ##################### End NON-BE switches ########################### */

/* ################## End MAINTENANCE switches ######################### */