From 3a0885146c61d6eff4da4006f6459e720fcf5ccd Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Wed, 25 Aug 2010 13:42:28 +0000
Subject: Move vp6_filter_diag4() from DSPContext to VP56DSPContext.

Originally committed as revision 24921 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/vp56dsp.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libavcodec/vp56dsp.c')

diff --git a/libavcodec/vp56dsp.c b/libavcodec/vp56dsp.c
index 9eb9299a36..83f53f9ffa 100644
--- a/libavcodec/vp56dsp.c
+++ b/libavcodec/vp56dsp.c
@@ -82,7 +82,12 @@ void ff_vp56dsp_init(VP56DSPContext *s, enum CodecID codec)
     } else {
         s->edge_filter_hor = vp6_edge_filter_hor;
         s->edge_filter_ver = vp6_edge_filter_ver;
+
+        if (CONFIG_VP6_DECODER) {
+            s->vp6_filter_diag4= ff_vp6_filter_diag4_c;
+        }
     }
 
     if (ARCH_ARM) ff_vp56dsp_init_arm(s, codec);
+    if (HAVE_MMX) ff_vp56dsp_init_x86(s, codec);
 }
-- 
cgit v1.2.3