summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-08-02 23:16:52 +0000
committerDiego Biurrun <diego@biurrun.de>2010-08-02 23:16:52 +0000
commit2e2ca50655a601a8a23d57afd17833ee0ee3dd9e (patch)
treec42408cba084e3782f6b9ed91c5f63b6d3475aaf /libavcodec
parent370b622a45b5d5302eed0be8d4d66e29cc8fd8e9 (diff)
Remove redundant h264pred.o from VP8 objects list.
It is already selected through the H264DSP dependency of VP8. Originally committed as revision 24672 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b84c23021b..b5e94df435 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -380,7 +380,7 @@ OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \
OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \
vp3dsp.o vp6dsp.o huffman.o cabac.o
OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56.o vp56data.o \
- h264pred.o cabac.o
+ cabac.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o