diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:21:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:26:31 +0100 |
| commit | 011d83de488d2051c485a1618dda0a43d77bcbc7 (patch) | |
| tree | dbde540836a29c1effe020f0a92c1c5978cd3c8d /libavcodec/ppc | |
| parent | 3775224b2f8a9c2c0bf5d53272236d4a1ffb0875 (diff) | |
| parent | 0e083d7e43805db1a978cb57bfa25fda62e8ff18 (diff) | |
| download | ffmpeg-011d83de488d2051c485a1618dda0a43d77bcbc7.tar.gz | |
Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
build: Group general components separate from de/encoders in arch Makefiles
Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 6656ffb985..80580b5d9e 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -8,10 +8,11 @@ OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o -OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o -OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o + +OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o +OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o ALTIVEC-OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_altivec.o \ |