Module: libav Branch: release/11 Commit: ac7695455df1947cb9909b562355d2ceea5e8f97
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Sat Jan 30 14:39:00 2016 +0100 fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs Also fix #endif comments in the FFT init code. (cherry picked from commit 47570dbde8b33001d5ccac44e7ebaaeecbcb807c) Signed-off-by: Diego Biurrun <[email protected]> --- libavcodec/ppc/fft_altivec.S | 4 ++-- libavcodec/ppc/fft_init.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/ppc/fft_altivec.S b/libavcodec/ppc/fft_altivec.S index c92b30b..cb7c871 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 9e79f70..a749900 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 */ } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
