xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-29 06:20:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'

Browse Source 
* commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-24 17:18:18 +00:00
commit 2cfb34a4e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ppc/fft_altivec.S
View File

@ -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 */

4
libavcodec/ppc/fft_init.c
View File

@ -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 */
}