aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-01-30 14:39:00 +0100
committerDiego Biurrun <diego@biurrun.de>2016-02-15 11:58:04 +0100
commit47570dbde8b33001d5ccac44e7ebaaeecbcb807c (patch)
tree1b7a56f2dabc59b5bff2864b8144d38ee15d5467
parentc15f6098b1b25689dd5e86aeb5ce69bc12efe1e1 (diff)
downloadffmpeg-47570dbde8b33001d5ccac44e7ebaaeecbcb807c.tar.gz
fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Also fix #endif comments in the FFT init code.
-rw-r--r--libavcodec/ppc/fft_altivec.S4
-rw-r--r--libavcodec/ppc/fft_init.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ppc/fft_altivec.S b/libavcodec/ppc/fft_altivec.S
index c92b30b897..cb7c8716cd 100644
--- a/libavcodec/ppc/fft_altivec.S
+++ b/libavcodec/ppc/fft_altivec.S
@@ -40,7 +40,7 @@
#include "config.h"
-#if HAVE_GNU_AS && HAVE_ALTIVEC
+#if HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN
#include "asm.S"
@@ -451,4 +451,4 @@ fft_dispatch_tab\suffix\()_altivec:
DECL_FFTS 0
DECL_FFTS 1, _interleave
-#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */
+#endif /* HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN */
diff --git a/libavcodec/ppc/fft_init.c b/libavcodec/ppc/fft_init.c
index 9e79f70ed0..a749900188 100644
--- a/libavcodec/ppc/fft_init.c
+++ b/libavcodec/ppc/fft_init.c
@@ -139,7 +139,7 @@ static void imdct_calc_altivec(FFTContext *s, FFTSample *output, const FFTSample
p1[k] = vec_perm(b, b, vcprm(3,2,1,0));
}
}
-#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */
+#endif /* HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN */
av_cold void ff_fft_init_ppc(FFTContext *s)
{
@@ -152,5 +152,5 @@ av_cold void ff_fft_init_ppc(FFTContext *s)
s->imdct_calc = imdct_calc_altivec;
s->imdct_half = imdct_half_altivec;
}
-#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */
+#endif /* HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN */
}