Commit d75d548b authored by emerit's avatar emerit
Browse files

fix define

parent 6f7b0315

lib_dec/ivas_output_config.c

+0 −7
Original line number Diff line number Diff line
@@ -40,17 +40,10 @@ 
#include <assert.h>

#endif

#include "wmc_auto.h"

<<<<<<< HEAD

#ifdef NON_DIEGETIC_PAN

#include <math.h>

#endif



=======

#ifdef NO_DIEGETIC_PAN

#include <math.h>

#endif

>>>>>>> 80eacbd02ef1877514960482abea13140f39a2ac



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

 * ivas_renderer_select()

 *