Commit 6f7b0315 authored by emerit's avatar emerit
Browse files

Merge branch 'orange/no-diegetic-pan' of... 

Merge branch 'orange/no-diegetic-pan' of forge.3gpp.org:ivas-codec-pc/ivas-codec into orange/no-diegetic-pan
parents d80daac9 80eacbd0

lib_dec/ivas_output_config.c

+6 −0
Original line number Diff line number Diff line
@@ -40,10 +40,16 @@ 
#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()

lib_rend/ivas_objectRenderer.c

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#include <stdint.h>

#include "options.h"

#include "prot.h"

#ifdef NO_DIEGETIC_PAN

#include "ivas_prot.h"

#endif

#include "ivas_prot_rend.h"

#include <math.h>

#include "ivas_rom_com.h"