Commit 24d34621 authored by multrus's avatar multrus
Browse files

more conflicts

parent 9e3d92bf

lib_enc/cod_tcx_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -4023,7 +4023,7 @@ void InternalTCXDecoder_fx( 
    Word16 Aq_old_fx[M + 1];

    Word32 sns_interpolated_scalefactors_fx[FDNS_NPTS], A_fx32[M + 1];

    Word16 *xn_buf16 = (Word16 *) xn_buf32;

#if !defined( ISSUE_1772_replace_shr_o ) || !defined( ISSUE_1796_replace_shl_o )

#if !defined( ISSUE_1796_replace_shl_o )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

lib_dec/FEC_HQ_core_fx.c

+1 −1

File changed.

Contains only whitespace changes.