Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'

[ffmpeg] / libavcodec / arm / vp8dsp_init_armv6.c

diff --git a/libavcodec/arm/vp8dsp_init_armv6.c b/libavcodec/arm/vp8dsp_init_armv6.c
index 563268e862a2f0794421e06af56e22353a7a1c14..d8197e7f9c08f3c2162320b1ef0abee791a0c70d 100644 (file)
--- a/libavcodec/arm/vp8dsp_init_armv6.c
+++ b/libavcodec/arm/vp8dsp_init_armv6.c
@@ -40,8 +40,9 @@ VP8_BILIN(16, armv6);
 VP8_BILIN(8,  armv6);
 VP8_BILIN(4,  armv6);
 
-av_cold void ff_vp8dsp_init_armv6(VP8DSPContext *dsp)
+av_cold void ff_vp8dsp_init_armv6(VP8DSPContext *dsp, int vp7)
 {
+    if (!vp7) {
     dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_armv6;
     dsp->vp8_luma_dc_wht_dc = ff_vp8_luma_dc_wht_dc_armv6;
 
@@ -62,6 +63,7 @@ av_cold void ff_vp8dsp_init_armv6(VP8DSPContext *dsp)
 
     dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_armv6;
     dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_armv6;
+    }
 
     dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_armv6;
     dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_armv6;