Commit 1a776ce6 authored by Jan Kiene's avatar Jan Kiene
Browse files

correct merge error to fix assert in dirac renderer

parent 757cf06d

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+411 −410
Original line number Diff line number Diff line
@@ -3192,6 +3192,8 @@ void ivas_dirac_dec_compute_directional_responses_fx( 
                IF( hodirac_flag )

                {

                    ivas_dirac_dec_get_response_fx_29( azimuth2[k], elevation2[k], direct_response_dir2_fx, hDirACRend->hOutSetup.ambisonics_order );

                }





                test();

                test();
@@ -3729,7 +3731,6 @@ void ivas_dirac_dec_compute_directional_responses_fx( 


    return;

}

}





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