Commit c94ee1c5 authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent feb30a0b

lib_com/prot.h

+2 −2
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ int32_t get_delay( 
    const IVAS_FORMAT ivas_format, /* i  : IVAS format                           */

#ifdef SPLIT_REND_WITH_HEAD_ROT

    HANDLE_CLDFB_FILTER_BANK hCldfb,        /* i  : Handle of Cldfb analysis            */

    const AUDIO_CONFIG output_config /* i  : decoder output config                 */

    const int16_t flag_binaural_split_coded /* i  : split rendering on/off flag         */

#else

    HANDLE_CLDFB_FILTER_BANK hCldfb /* i  : Handle of Cldfb analysis              */

#endif