Commit f7041b42 authored by norvell's avatar norvell Committed by multrus
Browse files

fix conflicts

parent 87415d50

lib_rend/ivas_objectRenderer_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ ivas_error ivas_td_binaural_open_ext_fx( 
    if ( NULL != hRendCfg )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        ism_number = s_and( (Word16) 0xFF, id );                    /* Exctract ISM number from ID */

        ism_number = sub( s_and( (Word16) 0xFF, id ), 1 );          /* Extract ISM number from ID */

        directivity_fx = hRendCfg->directivity_fx + 3 * ism_number; /* Address calculation -- no BASOPs */

#else

        directivity_fx = hRendCfg->directivity_fx;