diff --git a/configure b/configure
index 3fa4d7065e..28066b710c 100755
--- a/configure
+++ b/configure
@@ -2970,7 +2970,7 @@ utvideo_encoder_select="bswapdsp huffman llvidencdsp"
 vble_decoder_select="llviddsp"
 vbn_decoder_select="texturedsp"
 vbn_encoder_select="texturedspenc"
-vc1_decoder_select="blockdsp h264qpel intrax8 mpegvideodec msmpeg4dec vc1dsp"
+vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideodec vc1dsp"
 vc1image_decoder_select="vc1_decoder"
 vorbis_encoder_select="audio_frame_queue"
 vp3_decoder_select="hpeldsp vp3dsp videodsp"
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 4daf1666cc..a2c4c57728 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -27,8 +27,6 @@
  * MSMPEG4 backend for encoder and decoder
  */
 
-#include "config_components.h"
-
 #include "libavutil/thread.h"
 
 #include "avcodec.h"
@@ -40,8 +38,6 @@
 #include "msmpeg4data.h"
 #include "msmpeg4_vc1_data.h"
 #include "mpegvideodata.h"
-#include "vc1data.h"
-#include "libavutil/imgutils.h"
 
 /*
  * You can also call this codec: MPEG-4 with a twist!
@@ -139,16 +135,8 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s)
         s->y_dc_scale_table= ff_wmv1_y_dc_scale_table;
         s->c_dc_scale_table= ff_wmv1_c_dc_scale_table;
         break;
-#if CONFIG_VC1_DECODER
-    case 6:
-        s->y_dc_scale_table= ff_wmv3_dc_scale_table;
-        s->c_dc_scale_table= ff_wmv3_dc_scale_table;
-        break;
-#endif
-
     }
 
-
     if(s->msmpeg4_version>=4){
         ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,   ff_wmv1_scantable[1]);
         ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable,   ff_wmv1_scantable[0]);
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index dbcec3de74..26a196a38f 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -373,9 +373,6 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
         break;
     case 5:
         break;
-    case 6:
-        //FIXME + TODO VC1 decode mb
-        break;
     }
 
     s->slice_height= s->mb_height; //to avoid 1/0 if the first frame is not a keyframe
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b50f5b45aa..bcfd2bae0b 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -33,12 +33,12 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
+#include "h263dec.h"
 #include "hwconfig.h"
 #include "mpeg_er.h"
 #include "mpegvideo.h"
 #include "mpegvideodec.h"
 #include "msmpeg4_vc1_data.h"
-#include "msmpeg4dec.h"
 #include "profiles.h"
 #include "simple_idct.h"
 #include "vc1.h"
@@ -46,6 +46,7 @@
 #include "vc1_vlc_data.h"
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/thread.h"
 
 
@@ -406,11 +407,26 @@ static av_cold int vc1_decode_init_alloc_tables(VC1Context *v)
 
 av_cold int ff_vc1_decode_init(AVCodecContext *avctx)
 {
-    int ret = ff_msmpeg4_decode_init(avctx);
     VC1Context *const v = avctx->priv_data;
+    MpegEncContext *const s = &v->s;
+    int ret;
+
+    ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
     if (ret < 0)
         return ret;
 
+    ret = ff_h263_decode_init(avctx);
+    if (ret < 0)
+        return ret;
+
+    s->y_dc_scale_table = ff_wmv3_dc_scale_table;
+    s->c_dc_scale_table = ff_wmv3_dc_scale_table;
+
+    ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable,
+                      ff_wmv1_scantable[0]);
+    ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,
+                      ff_wmv1_scantable[1]);
+
     ret = vc1_decode_init_alloc_tables(v);
     if (ret < 0) {
         ff_vc1_decode_end(avctx);