diff --git a/configure b/configure
index ec2bb7e10d..bc603f6929 100755
--- a/configure
+++ b/configure
@@ -676,10 +676,20 @@ CMDLINE_SELECT="
 dxa_decoder_deps="zlib"
 flashsv_decoder_deps="zlib"
 flashsv_encoder_deps="zlib"
+flv_decoder_deps="h263_decoder"
 h263_decoder_deps="h263_parser"
+h263i_decoder_deps="h263_decoder"
 mpeg_xvmc_decoder_deps="xvmc"
+mpeg4_decoder_deps="h263_decoder"
+msmpeg4v1_decoder_deps="h263_decoder"
+msmpeg4v2_decoder_deps="h263_decoder"
+msmpeg4v3_decoder_deps="h263_decoder"
 png_decoder_deps="zlib"
 png_encoder_deps="zlib"
+vc1_decoder_deps="h263_decoder"
+wmv1_decoder_deps="h263_decoder"
+wmv2_decoder_deps="h263_decoder"
+wmv3_decoder_deps="h263_decoder"
 x264_encoder_deps="x264"
 xvid_encoder_deps="xvid"
 zmbv_decoder_deps="zlib"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ece2a2e0f7..8d616b2ca7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -37,8 +37,6 @@ OBJS= bitstream.o \
       rangecoder.o \
       pnm.o \
       h263.o \
-      msmpeg4.o \
-      h263dec.o \
       opt.o \
       bitstream_filter.o \
       audioconvert.o \
@@ -93,6 +91,7 @@ OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o
 OBJS-$(CONFIG_H261_DECODER)            += h261.o
 OBJS-$(CONFIG_H261_ENCODER)            += h261.o
+OBJS-$(CONFIG_H263_DECODER)            += h263dec.o
 OBJS-$(CONFIG_H264_DECODER)            += h264.o
 OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dsp.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
@@ -110,6 +109,12 @@ OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudio.o
 OBJS-$(CONFIG_MPC7_DECODER)            += mpc.o
+OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o
+OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o
+OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o
+OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o
+OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o
+OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o
 OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o
 OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
 OBJS-$(CONFIG_MSZH_DECODER)            += lcl.o
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index d57eaa5e4a..8162f642eb 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -835,6 +835,7 @@ static int wmv2_decode_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_WMV2_DECODER
 AVCodec wmv2_decoder = {
     "wmv2",
     CODEC_TYPE_VIDEO,
@@ -846,6 +847,7 @@ AVCodec wmv2_decoder = {
     ff_h263_decode_frame,
     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
 };
+#endif
 
 #ifdef CONFIG_ENCODERS
 AVCodec wmv2_encoder = {