aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-28 18:05:34 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-28 18:05:34 +0000
commita8beb22f4def164be718261092a42b9294e50e3f (patch)
treead0a4a1d057b2331e6f1e9040cf7e7a9fdd691fd
parent4414137ebaa361eda3503f43c4e3a5871606acb6 (diff)
downloadffmpeg-a8beb22f4def164be718261092a42b9294e50e3f.tar.gz
Declare dependencies of RV10/RV20 decoders on the H.263 decoder in configure.
Originally committed as revision 20953 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index c692cbaab6..0aa592bd39 100755
--- a/configure
+++ b/configure
@@ -1150,7 +1150,9 @@ nellymoser_encoder_select="fft mdct"
png_decoder_select="zlib"
png_encoder_select="zlib"
qdm2_decoder_select="fft mdct rdft"
+rv10_decoder_select="h263_decoder"
rv10_encoder_select="h263_encoder"
+rv20_decoder_select="h263_decoder"
rv20_encoder_select="h263_encoder"
rv30_decoder_select="golomb"
rv40_decoder_select="golomb"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a0b03e7eaa..3732d5f67c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -251,11 +251,9 @@ OBJS-$(CONFIG_ROQ_ENCODER) += roqvideoenc.o roqvideo.o elbg.o
OBJS-$(CONFIG_ROQ_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_ROQ_DPCM_ENCODER) += roqaudioenc.o
OBJS-$(CONFIG_RPZA_DECODER) += rpza.o
-OBJS-$(CONFIG_RV10_DECODER) += rv10.o h263.o \
- mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_RV10_DECODER) += rv10.o
OBJS-$(CONFIG_RV10_ENCODER) += rv10enc.o
-OBJS-$(CONFIG_RV20_DECODER) += rv10.o h263.o \
- mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_RV20_DECODER) += rv10.o
OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o
OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o h264pred.o rv30dsp.o \
mpegvideo.o error_resilience.o