Commit bb9d0c38 authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 7ac12a0e

lib_dec/ivas_output_config.c

+2 −2
Original line number Diff line number Diff line
@@ -157,9 +157,9 @@ void ivas_renderer_select( 
            *internal_config = IVAS_AUDIO_CONFIG_HOA3;



#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;