vp9lpf/x86: make filter_48/84_v work on 32-bit.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago · b905e8d2fe
parent 37637e6590
commit b905e8d2fe
2 changed files with 9 additions and 7 deletions
--- a/libavcodec/x86/vp9dsp_init.c
+++ b/libavcodec/x86/vp9dsp_init.c
@ -287,9 +287,13 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
    dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \
    if (ARCH_X86_64) { \
        dsp->loop_filter_mix2[0][1][0] = ff_vp9_loop_filter_h_48_16_##opt; \
+    } \
    dsp->loop_filter_mix2[0][1][1] = ff_vp9_loop_filter_v_48_16_##opt; \
+    if (ARCH_X86_64) { \
        dsp->loop_filter_mix2[1][0][0] = ff_vp9_loop_filter_h_84_16_##opt; \
+    } \
    dsp->loop_filter_mix2[1][0][1] = ff_vp9_loop_filter_v_84_16_##opt; \
+    if (ARCH_X86_64) { \
        dsp->loop_filter_mix2[1][1][0] = ff_vp9_loop_filter_h_88_16_##opt; \
    } \
    dsp->loop_filter_mix2[1][1][1] = ff_vp9_loop_filter_v_88_16_##opt; \
--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm
@ -921,8 +921,6 @@ LPF_16_VH %1, %2, %3, avx
 LPF_16_VH_ALL_OPTS 16, 512
 %endif
 LPF_16_VH_ALL_OPTS 44,   0,  0
-%if ARCH_X86_64
-LPF_16_VH_ALL_OPTS 48, 256
-LPF_16_VH_ALL_OPTS 84, 256
-%endif
+LPF_16_VH_ALL_OPTS 48, 256, 16
+LPF_16_VH_ALL_OPTS 84, 256, 16
 LPF_16_VH_ALL_OPTS 88, 256, 16