aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ppc/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-24 14:44:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-24 15:47:47 +0100
commitfc13a89654b5878050ac07e36254c5e712aa8820 (patch)
tree73e35d94880aae72b785ef9d1079c442a552777b /libavcodec/ppc/Makefile
parent70b0aeba001c61d52965debda4875e610bb2435e (diff)
parente9d817351b28e62868528476971afe4cde1fa280 (diff)
downloadffmpeg-fc13a89654b5878050ac07e36254c5e712aa8820.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dsputil: Separate h264 qpel Conflicts: libavcodec/dsputil_template.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/Makefile')
-rw-r--r--libavcodec/ppc/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index cdc6435be1..e152483e7c 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -1,6 +1,7 @@
OBJS += ppc/dsputil_ppc.o \
ppc/videodsp_ppc.o \
+OBJS-$(CONFIG_H264QPEL) += ppc/h264_qpel.o
OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o
OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o