diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 00:56:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 01:34:08 +0200 |
| commit | aa61ca0c592b6169edf82990078579ada49a3332 (patch) | |
| tree | 5eff589b0be2b0e7fb601b4efd0c3670a51dc371 /libavcodec/ppc | |
| parent | f428c29c23931620eafe692bede0773f66fe17e3 (diff) | |
| parent | d3f751e6030545c5e1f312c5a83c1e6ed5794f18 (diff) | |
| download | ffmpeg-aa61ca0c592b6169edf82990078579ada49a3332.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add some missing mathematics.h #includes for av_rescale().
opencore-amr: Add missing initializer braces to shut up gcc warning.
ARM: workaround for bug in GNU assembler
dv: fix comment wording mistake
Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c
dv: fix valgrind use of uninitialised value warnings.
mxfenc: fix ignored drop flag in binary timecode representation.
PPC: use Altivec IMDCT only for supported sizes
dv: fix comment spelling
configure: simplify -rpath-link linker flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/fft_altivec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_altivec.c index 1ea2369f55..e171665b37 100644 --- a/libavcodec/ppc/fft_altivec.c +++ b/libavcodec/ppc/fft_altivec.c @@ -141,7 +141,9 @@ av_cold void ff_fft_init_altivec(FFTContext *s) { #if HAVE_GNU_AS s->fft_calc = ff_fft_calc_interleave_altivec; - s->imdct_calc = ff_imdct_calc_altivec; - s->imdct_half = ff_imdct_half_altivec; + if (s->mdct_bits >= 5) { + s->imdct_calc = ff_imdct_calc_altivec; + s->imdct_half = ff_imdct_half_altivec; + } #endif } |