From b2bf38b4461f7466d80ef4a96c06ed4b3b249322 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 5 Aug 2009 10:44:12 +0000 Subject: [PATCH] Declare the dependency of RV10/RV20 encoder on the H.263 encoder in configure. Originally committed as revision 19592 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 4 ++-- libavcodec/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 69c0d015dd..d747636d4e 100755 --- a/configure +++ b/configure @@ -1106,8 +1106,8 @@ nellymoser_encoder_select="fft mdct" png_decoder_select="zlib" png_encoder_select="zlib" qdm2_decoder_select="fft mdct rdft" -rv10_encoder_select="aandct" -rv20_encoder_select="aandct" +rv10_encoder_select="h263_encoder" +rv20_encoder_select="h263_encoder" rv30_decoder_select="golomb" rv40_decoder_select="golomb" shorten_decoder_select="golomb" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3360c9236d..27aca0c0f7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -194,9 +194,9 @@ 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_ENCODER) += rv10enc.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_RV10_ENCODER) += rv10enc.o OBJS-$(CONFIG_RV20_DECODER) += rv10.o h263.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o h264pred.o rv30dsp.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o h264pred.o rv40dsp.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_SGI_DECODER) += sgidec.o