diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 12:47:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 12:49:23 +0200 |
| commit | 0beff42823223659d75e7382d41a1e2a954bbfad (patch) | |
| tree | 4363263395b78eef5d92bbefa133b0534fb4485c /libavcodec | |
| parent | 6021615bbe393381f23b34a7cd0dcfd1a42687ba (diff) | |
| parent | 0671adbb18f79e834d5c1e68a322d75e4524a8dc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ppc/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index c22a2bc1d3..71b23da10e 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -2,9 +2,7 @@ OBJS += ppc/dsputil_ppc.o \ ppc/fmtconvert_altivec.o \ ppc/videodsp_ppc.o \ -FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o -OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \ - $(FFT-OBJS-yes) +OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o @@ -21,3 +19,6 @@ ALTIVEC-OBJS += ppc/dsputil_altivec.o \ ppc/gmc_altivec.o \ ppc/idct_altivec.o \ ppc/int_altivec.o \ + +FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o +ALTIVEC-OBJS-$(CONFIG_FFT) += $(FFT-OBJS-yes) |