Commit 2cfb34a4 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '47570dbd'

* commit '47570dbd':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 259fef86 47570dbd
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "config.h" #include "config.h"
#if HAVE_GNU_AS && HAVE_ALTIVEC #if HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN
#include "asm.S" #include "asm.S"
...@@ -451,4 +451,4 @@ fft_dispatch_tab\suffix\()_altivec: ...@@ -451,4 +451,4 @@ fft_dispatch_tab\suffix\()_altivec:
DECL_FFTS 0 DECL_FFTS 0
DECL_FFTS 1, _interleave DECL_FFTS 1, _interleave
#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */ #endif /* HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN */
...@@ -147,7 +147,7 @@ static void imdct_calc_altivec(FFTContext *s, FFTSample *output, const FFTSample ...@@ -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)); 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) av_cold void ff_fft_init_ppc(FFTContext *s)
{ {
...@@ -164,5 +164,5 @@ 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_calc = imdct_calc_altivec;
s->imdct_half = imdct_half_altivec; s->imdct_half = imdct_half_altivec;
} }
#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */ #endif /* HAVE_GNU_AS && HAVE_ALTIVEC && HAVE_BIGENDIAN */
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment