Commit c8c9fecd authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Add missing merge fix

parent 6f6df319

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -408,8 +408,10 @@ ivas_error ivas_jbm_dec_tc( 
            ivas_mono_downmix_render_passive( st_ivas, output, output_frame );

        }



#ifndef FIX_657_REMOVE_EDITING

        /* Set edited object positions, if editing enabled */

        ivas_omasa_set_edited_objects( st_ivas );

#endif

    }

#endif

    else if ( st_ivas->ivas_format == MC_FORMAT )