Commit fba364a3 authored by emerit's avatar emerit
Browse files

fix merge

parent 56a82d04

lib_com/ivas_prot.h

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ ivas_error ivas_set_ism_metadata( 
    const float radius_meta,                                    /* i  : radius                                      */

    const float yaw,                                            /* i  : yaw                                         */

    const float pitch                                           /* i  : pitch                                       */

    const float elevation                                       /* i  : elevation value                             */

#ifdef ISM_NO_DIEGETIC_PAN

,

    const float no_diegetic_pan,                                      /* i  : no diegetic pan           */

lib_dec/ivas_ism_metadata_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int 
#ifdef ISM_NO_DIEGETIC_PAN

int16_t decode_no_diegetic_pan( DEC_CORE_HANDLE st0, int16_t *last_ndp_idx, int16_t *flag_abs_ndp );

#endif

#endif



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

 * ivas_ism_metadata_dec()