Commit 1657df9b authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 2dd3a2ab

lib_enc/ivas_spar_md_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -838,7 +838,6 @@ ivas_error ivas_spar_md_enc_process( 
            }

        }



        ivas_create_fullr_dmx_mat( pred_coeffs_re, dm_fv_re, hMdEnc->mixer_mat, nchan, 0, num_bands, active_w, &hMdEnc->spar_md_cfg );

#ifdef SBA_HOA_HBR_IMPROV

        if ( hMdEnc->spar_hoa_md_flag )

        {
@@ -855,6 +854,8 @@ ivas_error ivas_spar_md_enc_process( 
        }

#endif



        ivas_create_fullr_dmx_mat( pred_coeffs_re, dm_fv_re, hMdEnc->mixer_mat, nchan, 0, num_bands, active_w, &hMdEnc->spar_md_cfg );



        for ( b = 0; b < num_bands; b++ )

        {

            ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[b * bands_bw];