Merge commit 'e807491fc6a336e4becc0cbc981274a8fde18aba'

[ffmpeg] / libavcodec / ppc / idctdsp.c

diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c
index f1b42470fb913713e5f97f20b304742c84ac42bb..29f625a01c7fbfef907f9b599130f6acaa49279c 100644 (file)
--- a/libavcodec/ppc/idctdsp.c
+++ b/libavcodec/ppc/idctdsp.c
@@ -30,17 +30,16 @@
  * IDCT function itself was to factor out the partial transposition, and to
  * perform a full transpose at the end of the function. */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
-#if HAVE_ALTIVEC_H
-#include <altivec.h>
-#endif
 
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/ppc/cpu.h"
-#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+
 #include "libavcodec/idctdsp.h"
 
 #if HAVE_ALTIVEC