Commit c70ce53f authored by vaclav's avatar vaclav
Browse files

fix merge issue causing build warning

parent f9192357

lib_com/ivas_prot.h

+0 −13
Original line number Diff line number Diff line
@@ -4327,19 +4327,6 @@ ivas_error ivas_spar_md_enc_init 
    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);



#ifdef FIX_SBA_VANISHING_RESIDUAL

int16_t ivas_spar_get_activeW_flag(

    ivas_enc_cov_handler_state_t *hCovEnc,

    float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],

    float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],

    const int16_t dtx_vad,

    const int16_t nchan_inp,

	const int16_t nchan_transport,

	int16_t *res_ind,

	const int16_t *dmx_order

);

#endif



void ivas_agc_dec_process( 

    ivas_agc_dec_state_t *hAgcDec,                              /* i/o: AGC decoder handle                      */

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

lib_enc/ivas_enc_cov_handler.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void ivas_spar_covar_enc_close( 
 *

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



int16_t ivas_spar_get_activeW_flag(

static int16_t ivas_spar_get_activeW_flag(

    ivas_enc_cov_handler_state_t *hCovEnc,

    float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],

    float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],