vp9/x86: make filter_16_v work on 32-bit.

047088b8 · Ronald S. Bultje · 0cc9c23e · 047088b8 · 047088b8
Commit 047088b8 authored Dec 26, 2014 by Ronald S. Bultje
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 99 additions and 40 deletions

vp9dsp_init.c libavcodec/x86/vp9dsp_init.c +3 -1

vp9lpf.asm libavcodec/x86/vp9lpf.asm +96 -39

No files found.
--- a/libavcodec/x86/vp9dsp_init.c
+++ b/libavcodec/x86/vp9dsp_init.c
@@ -344,7 +344,9 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
 #define init_lpf(opt) do { \
    if (ARCH_X86_64) { \
        dsp->loop_filter_16[0] = ff_vp9_loop_filter_h_16_16_##opt; \
-        dsp->loop_filter_16[1] = ff_vp9_loop_filter_v_16_16_##opt; \
+    } \
+    dsp->loop_filter_16[1] = ff_vp9_loop_filter_v_16_16_##opt; \
+    if (ARCH_X86_64) { \
        dsp->loop_filter_mix2[0][0][0] = ff_vp9_loop_filter_h_44_16_##opt; \
    } \
    dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \

--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm