Commit 7ac12a0e authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent d7a966c7

lib_util/hrtf_file_reader.c

+4 −8
Original line number Diff line number Diff line
@@ -1053,8 +1053,8 @@ static ivas_error create_HRTF_from_rawdata( 
static ivas_error create_fastconv_HRTF_from_rawdata(

    HRTFS_FASTCONV_HANDLE *hHRTF,               /* i/o: HRTF FastConv handle   */

    char *hrtf_data,                            /* i  : pointer to binary file */

    HRTF_READER_RENDERER_TYPE rend_type,  /* i  : Renderer type          */

    BINAURAL_INPUT_AUDIO_CONFIG input_cfg /* i  : Input binaural config  */

    const HRTF_READER_RENDERER_TYPE rend_type,  /* i  : Renderer type          */

    const BINAURAL_INPUT_AUDIO_CONFIG input_cfg /* i  : Input binaural config  */

)

{

    int16_t i, j;
@@ -1062,10 +1062,6 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
    ivas_error error;



    ( *hHRTF )->allocate_init_flag = 0;

    if ( ( error = ivas_allocate_binaural_hrtf( *hHRTF, 0, input_cfg, rend_type, ( *hHRTF )->allocate_init_flag ) ) != IVAS_ERR_OK )

    {

        return error;

    }



    if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV )

    {