Commit c011a055 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ivas-float-update' into ms_decision_float_ref

parents bbf97be6 2e062fa2

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ stages: 


.build-job-linux:

  stage: build

  timeout: "2 minutes"

  timeout: "20 minutes"

  needs: []

  tags:

    - ivas-basop-linux

lib_enc/ivas_stereo_dmx_evs.c

+3 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,8 @@ void stereo_dmx_evs_enc( 


    int16_t input_frame;



    push_wmops( "stereo_dmx_evs_enc" );



    if ( is_binaural )

    {

        /* use of is_binaural flag is to be considered */
@@ -1358,6 +1360,7 @@ void stereo_dmx_evs_enc( 


    mvr2s( p_dmx_data, data, n_samples );



    pop_wmops();



    return;

}