diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:18:18 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:18:27 +0000 |
| commit | 2cfb34a4e8b464d790513ad42860869677ef79d9 (patch) | |
| tree | 2c423509e301714dc6d0989c41ca072f041bd96e | |
| parent | 259fef86bb91784f31a7e43e0d6d6a2a1d86f41c (diff) | |
| parent | 47570dbde8b33001d5ccac44e7ebaaeecbcb807c (diff) | |
| download | ffmpeg-2cfb34a4e8b464d790513ad42860869677ef79d9.tar.gz | |
Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'
* commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c':
fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/ppc/fft_altivec.S | 4 | ||||
| -rw-r--r-- | 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 aab669ea45..bcc242d9a8 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 675fa33a95..cbeaf98952 100644 --- a/libavcodec/ppc/fft_init.c +++ b/libavcodec/ppc/fft_init.c @@ -147,7 +147,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) { @@ -164,5 +164,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 */ } |