Commit d2c58bd4 authored by vaclav's avatar vaclav
Browse files

correct merge

parent 912708d4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@

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



/* ################## End BE DEVELOPMENT switches ######################### */
/* #################### Start NON-BE switches ############################ */
/* any switch which is non-be wrt selection floating point code */
/* all switches in this category should start with "NONBE_" */

#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */
#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/