jpeg2000: Merge rescaling with interleaving in 9/7 IDWT

[ffmpeg] / libavcodec / fmtconvert.c

diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c
index 58fece70b2d5150defe9c973bc180ad98fe1c369..5b7ab034ae95c42f94ab64f32fd4a2728a42b04b 100644 (file)
--- a/libavcodec/fmtconvert.c
+++ b/libavcodec/fmtconvert.c
@@ -22,6 +22,7 @@
 
 #include "avcodec.h"
 #include "fmtconvert.h"
+#include "libavutil/common.h"
 
 static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){
     int i;
@@ -83,6 +84,6 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
     c->float_interleave           = ff_float_interleave_c;
 
     if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx);
-    if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx);
-    if (HAVE_MMX) ff_fmt_convert_init_x86(c, avctx);
+    if (ARCH_PPC) ff_fmt_convert_init_ppc(c, avctx);
+    if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx);
 }