summaryrefslogtreecommitdiff
path: root/libavcodec/arm/vp8dsp_init_armv6.c
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2014-02-14 22:58:17 +1100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-15 02:15:35 +0100
commitb8664c929437d6d079e16979c496a2db40cf2324 (patch)
tree83dc86431b7a313f87b7c6958cce71ef426f5954 /libavcodec/arm/vp8dsp_init_armv6.c
parenta91d9e4b6355a697c6c0df0fb1f01633d6db0ea5 (diff)
avcodec/vp8dsp: add VP7 idct and loop filter
Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vp8dsp_init_armv6.c')
-rw-r--r--libavcodec/arm/vp8dsp_init_armv6.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/arm/vp8dsp_init_armv6.c b/libavcodec/arm/vp8dsp_init_armv6.c
index 563268e862..d8197e7f9c 100644
--- 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;