summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-08 21:36:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-08 21:46:34 +0200
commit52dc18d414f4aa2c5a210edfb82cc1a99942ca3b (patch)
treec2aedd51f56ee49222c76f44b238c16102132db1 /libavcodec/vc1dsp.c
parentac627b3d38d370027406c93c2dcaac0b1712a7d4 (diff)
parent7e522859fc463a14875f78957bb57d2f33607d19 (diff)
downloadffmpeg-52dc18d414f4aa2c5a210edfb82cc1a99942ca3b.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dsp.c')
-rw-r--r--libavcodec/vc1dsp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index c2b7eff278..a874509ca9 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -850,6 +850,6 @@ av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
if (HAVE_ALTIVEC)
ff_vc1dsp_init_altivec(dsp);
- if (HAVE_MMX)
- ff_vc1dsp_init_mmx(dsp);
+ if (ARCH_X86)
+ ff_vc1dsp_init_x86(dsp);
}