30 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index bcb6fff25..2462d252c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1177,7 +1177,6 @@ src/input/libdvdnav/Makefile
 src/input/librtsp/Makefile
 src/input/libreal/Makefile
 src/input/vcd/Makefile
-src/libmpeg2/Makefile
 src/libspudec/Makefile
 src/libspucc/Makefile
 src/libspucmml/Makefile
@@ -1199,6 +1198,7 @@ src/post/audio/Makefile
 src/post/deinterlace/Makefile
 src/post/deinterlace/plugins/Makefile
 src/video_dec/Makefile
+src/video_dec/libmpeg2/Makefile
 src/video_out/Makefile
 src/video_out/macosx/Makefile
 src/xine-utils/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b16acb35..a94673fb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS = \
 	dxr3 \
 	input \
 	demuxers \
-	libmpeg2 \
 	libspudec \
 	libspucc \
 	libspucmml \
diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am
index 321d70c1f..91246eb4d 100644
--- a/src/video_dec/Makefile.am
+++ b/src/video_dec/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = libmpeg2
+
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/libmpeg2/Makefile.am b/src/video_dec/libmpeg2/Makefile.am
index d772f0e09..d772f0e09 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/video_dec/libmpeg2/Makefile.am
diff --git a/src/libmpeg2/cpu_state.c b/src/video_dec/libmpeg2/cpu_state.c
index 12963644c..12963644c 100644
--- a/src/libmpeg2/cpu_state.c
+++ b/src/video_dec/libmpeg2/cpu_state.c
diff --git a/src/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c
index 145d5f58b..145d5f58b 100644
--- a/src/libmpeg2/decode.c
+++ b/src/video_dec/libmpeg2/decode.c
diff --git a/src/libmpeg2/header.c b/src/video_dec/libmpeg2/header.c
index 12ba0ff8a..12ba0ff8a 100644
--- a/src/libmpeg2/header.c
+++ b/src/video_dec/libmpeg2/header.c
diff --git a/src/libmpeg2/idct.c b/src/video_dec/libmpeg2/idct.c
index 9f216db58..9f216db58 100644
--- a/src/libmpeg2/idct.c
+++ b/src/video_dec/libmpeg2/idct.c
diff --git a/src/libmpeg2/idct_altivec.c b/src/video_dec/libmpeg2/idct_altivec.c
index de396560b..de396560b 100644
--- a/src/libmpeg2/idct_altivec.c
+++ b/src/video_dec/libmpeg2/idct_altivec.c
diff --git a/src/libmpeg2/idct_mlib.c b/src/video_dec/libmpeg2/idct_mlib.c
index e573c9790..e573c9790 100644
--- a/src/libmpeg2/idct_mlib.c
+++ b/src/video_dec/libmpeg2/idct_mlib.c
diff --git a/src/libmpeg2/idct_mlib.h b/src/video_dec/libmpeg2/idct_mlib.h
index 1fb0787dd..1fb0787dd 100644
--- a/src/libmpeg2/idct_mlib.h
+++ b/src/video_dec/libmpeg2/idct_mlib.h
diff --git a/src/libmpeg2/idct_mmx.c b/src/video_dec/libmpeg2/idct_mmx.c
index 6bb4bfbf0..6bb4bfbf0 100644
--- a/src/libmpeg2/idct_mmx.c
+++ b/src/video_dec/libmpeg2/idct_mmx.c
diff --git a/src/libmpeg2/libmpeg2_accel.c b/src/video_dec/libmpeg2/libmpeg2_accel.c
index 92c0e280b..92c0e280b 100644
--- a/src/libmpeg2/libmpeg2_accel.c
+++ b/src/video_dec/libmpeg2/libmpeg2_accel.c
diff --git a/src/libmpeg2/libmpeg2_accel.h b/src/video_dec/libmpeg2/libmpeg2_accel.h
index 5d0b37a78..5d0b37a78 100644
--- a/src/libmpeg2/libmpeg2_accel.h
+++ b/src/video_dec/libmpeg2/libmpeg2_accel.h
diff --git a/src/libmpeg2/motion_comp.c b/src/video_dec/libmpeg2/motion_comp.c
index 9328dfb9f..9328dfb9f 100644
--- a/src/libmpeg2/motion_comp.c
+++ b/src/video_dec/libmpeg2/motion_comp.c
diff --git a/src/libmpeg2/motion_comp_altivec.c b/src/video_dec/libmpeg2/motion_comp_altivec.c
index 99719b7fb..99719b7fb 100644
--- a/src/libmpeg2/motion_comp_altivec.c
+++ b/src/video_dec/libmpeg2/motion_comp_altivec.c
diff --git a/src/libmpeg2/motion_comp_mlib.c b/src/video_dec/libmpeg2/motion_comp_mlib.c
index 1a37070ae..1a37070ae 100644
--- a/src/libmpeg2/motion_comp_mlib.c
+++ b/src/video_dec/libmpeg2/motion_comp_mlib.c
diff --git a/src/libmpeg2/motion_comp_mmx.c b/src/video_dec/libmpeg2/motion_comp_mmx.c
index f9b1f085d..f9b1f085d 100644
--- a/src/libmpeg2/motion_comp_mmx.c
+++ b/src/video_dec/libmpeg2/motion_comp_mmx.c
diff --git a/src/libmpeg2/motion_comp_vis.c b/src/video_dec/libmpeg2/motion_comp_vis.c
index d0a6673d6..d0a6673d6 100644
--- a/src/libmpeg2/motion_comp_vis.c
+++ b/src/video_dec/libmpeg2/motion_comp_vis.c
diff --git a/src/libmpeg2/mpeg2.h b/src/video_dec/libmpeg2/mpeg2.h
index 253f300a2..253f300a2 100644
--- a/src/libmpeg2/mpeg2.h
+++ b/src/video_dec/libmpeg2/mpeg2.h
diff --git a/src/libmpeg2/mpeg2_internal.h b/src/video_dec/libmpeg2/mpeg2_internal.h
index 2e42aace6..2e42aace6 100644
--- a/src/libmpeg2/mpeg2_internal.h
+++ b/src/video_dec/libmpeg2/mpeg2_internal.h
diff --git a/src/libmpeg2/slice.c b/src/video_dec/libmpeg2/slice.c
index 8247a9a24..8247a9a24 100644
--- a/src/libmpeg2/slice.c
+++ b/src/video_dec/libmpeg2/slice.c
diff --git a/src/libmpeg2/slice_xvmc.c b/src/video_dec/libmpeg2/slice_xvmc.c
index 014ae7924..014ae7924 100644
--- a/src/libmpeg2/slice_xvmc.c
+++ b/src/video_dec/libmpeg2/slice_xvmc.c
diff --git a/src/libmpeg2/slice_xvmc_vld.c b/src/video_dec/libmpeg2/slice_xvmc_vld.c
index 3606cf66b..3606cf66b 100644
--- a/src/libmpeg2/slice_xvmc_vld.c
+++ b/src/video_dec/libmpeg2/slice_xvmc_vld.c
diff --git a/src/libmpeg2/stats.c b/src/video_dec/libmpeg2/stats.c
index 63c701179..63c701179 100644
--- a/src/libmpeg2/stats.c
+++ b/src/video_dec/libmpeg2/stats.c
diff --git a/src/libmpeg2/vis.h b/src/video_dec/libmpeg2/vis.h
index 69dd49075..69dd49075 100644
--- a/src/libmpeg2/vis.h
+++ b/src/video_dec/libmpeg2/vis.h
diff --git a/src/libmpeg2/vlc.h b/src/video_dec/libmpeg2/vlc.h
index 65de9a840..65de9a840 100644
--- a/src/libmpeg2/vlc.h
+++ b/src/video_dec/libmpeg2/vlc.h
diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
index 3a3e28452..3a3e28452 100644
--- a/src/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
diff --git a/src/libmpeg2/xvmc.h b/src/video_dec/libmpeg2/xvmc.h
index 5d61bcf83..5d61bcf83 100644
--- a/src/libmpeg2/xvmc.h
+++ b/src/video_dec/libmpeg2/xvmc.h
diff --git a/src/libmpeg2/xvmc_vld.h b/src/video_dec/libmpeg2/xvmc_vld.h
index 561d1789d..561d1789d 100644
--- a/src/libmpeg2/xvmc_vld.h
+++ b/src/video_dec/libmpeg2/xvmc_vld.h