diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 02:06:42 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 02:06:42 +0300 |
commit | 7fce8c752d87ca4738179bb7e9238bae67abdeac (patch) | |
tree | cf884999bbf61ac8a23cc37843915e49e51a42d7 /libavcodec/ppc | |
parent | 5c17377e28e818d3074a608d42821d66f1d26e8d (diff) | |
parent | 71f1ad37d858b810b71a4af1c25771beaa50b27b (diff) |
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 6f7eeb7286..30d04b846a 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -1,11 +1,10 @@ -OBJS += ppc/fmtconvert_altivec.o \ - # subsystems OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o OBJS-$(CONFIG_FFT) += ppc/fft_init.o \ ppc/fft_altivec.o \ ppc/fft_vsx.o +OBJS-$(CONFIG_FMTCONVERT) += ppc/fmtconvert_altivec.o OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o ppc/hpeldsp_altivec.o OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o |