aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-29 11:11:07 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-29 11:11:07 +0000
commitf95bfab05cb0edbed2830dca7bc79d46b42bbf95 (patch)
treee155fd68a1262986e830956e7fcdbb0cca7e3bd3 /libavcodec
parent9caa7ba48db438ce718c12a6c6fc887af000b0e1 (diff)
downloadffmpeg-f95bfab05cb0edbed2830dca7bc79d46b42bbf95.tar.gz
Declare WMV1/WMV2/VC-1 decoder dependency on the H.263 decoder in configure.
Originally committed as revision 20959 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d4a3c114c7..03395590a1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -308,9 +308,7 @@ OBJS-$(CONFIG_V210X_DECODER) += v210x.o
OBJS-$(CONFIG_VB_DECODER) += vb.o
OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \
msmpeg4.o msmpeg4data.o \
- h263dec.o h263.o \
- intrax8.o intrax8dsp.o \
- mpegvideo.o error_resilience.o
+ intrax8.o intrax8dsp.o
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
@@ -333,13 +331,9 @@ OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o
OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o
-OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o \
- mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \
msmpeg4.o msmpeg4data.o \
- h263dec.o h263.o \
- intrax8.o intrax8dsp.o \
- mpegvideo.o error_resilience.o
+ intrax8.o intrax8dsp.o
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \
msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o