Commit 9acde778 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge error

parent a75504b0
Loading
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ typedef struct dirac_dec_stack_mem
    Word16 *q_cy_auto_dir_smooth;
    Word16 *q_cy_cross_dir_smooth;
    Word16 *q_cy_auto_diff_smooth;
#else
    Word16 cy_cross_dir_smooth;
    Word16 cy_auto_dir_smooth;
    Word16 cy_auto_diff_smooth;
#endif

    Word32 *reference_power_fx;