27 files changed, 34 insertions, 37 deletions
diff --git a/configure b/configure
index 4df422a7dc..9e4e7e1271 100755
--- a/configure
+++ b/configure
@@ -7264,7 +7264,7 @@ RANLIB = $_ranlib
 INSTALL = $_install
 # FIXME: Should only be _inc_extra eventually.
 EXTRA_INC = $_inc_extra
-OPTFLAGS = -I../libvo -I../../libvo $CFLAGS \$(EXTRA_INC)
+OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 STRIPBINARIES = $_stripbinaries
 CHARSET = $_charset
 HELP_FILE = $_mp_help
diff --git a/libmenu/Makefile b/libmenu/Makefile
index 875577e9cb..3c50a754ff 100644
--- a/libmenu/Makefile
+++ b/libmenu/Makefile
@@ -18,7 +18,7 @@ SRCS += menu_dvbin.c
 endif
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = -I. -I.. -I../libmpcodecs $(OPTFLAGS)
+CFLAGS  = -I. -I.. $(OPTFLAGS)
 
 .SUFFIXES: .c .o
 
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 247faf8461..43af633b47 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -15,8 +15,8 @@
 #include "asxparser.h"
 #include "stream/stream.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 #include "m_option.h"
 #include "m_struct.h"
 #include "menu.h"
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c
index 5d266d014e..a003c16d34 100644
--- a/libmenu/menu_cmdlist.c
+++ b/libmenu/menu_cmdlist.c
@@ -8,8 +8,8 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index d8d6704b7b..a6788dd682 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "m_struct.h"
 #include "m_option.h"
diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c
index f3525f293f..f6e6253e9e 100644
--- a/libmenu/menu_dvbin.c
+++ b/libmenu/menu_dvbin.c
@@ -16,8 +16,8 @@
 #include "m_struct.h"
 #include "m_option.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "menu.h"
 #include "menu_list.h"
diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c
index b4b3b98783..bb0380b0d2 100644
--- a/libmenu/menu_filesel.c
+++ b/libmenu/menu_filesel.c
@@ -18,8 +18,8 @@
 #include "m_struct.h"
 #include "m_option.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "menu.h"
 #include "menu_list.h"
diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c
index f03039e351..9da2e8922d 100644
--- a/libmenu/menu_list.c
+++ b/libmenu/menu_list.c
@@ -6,8 +6,8 @@
 
 #include "config.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "m_struct.h"
 #include "menu.h"
diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c
index e227c1aa22..eba29f8d62 100644
--- a/libmenu/menu_param.c
+++ b/libmenu/menu_param.c
@@ -18,8 +18,8 @@
 #include "m_property.h"
 #include "asxparser.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "menu.h"
 #include "menu_list.h"
diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c
index a2f5e67455..e49a865351 100644
--- a/libmenu/menu_pt.c
+++ b/libmenu/menu_pt.c
@@ -8,8 +8,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "m_struct.h"
 #include "m_option.h"
diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c
index 1d836c98ca..2fb79fcec7 100644
--- a/libmenu/menu_txt.c
+++ b/libmenu/menu_txt.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "img_format.h"
-#include "mp_image.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
 
 #include "m_struct.h"
 #include "m_option.h"
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index bda9aa351e..3164377a0f 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 
 #include "swscale.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
 
 static int testFormat[]={
 IMGFMT_YVU9,
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 5b1a78fdc8..18ae7ae352 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -71,7 +71,7 @@ untested special converters
 #include "swscale_internal.h"
 #include "x86_cpu.h"
 #include "bswap.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "rgb2rgb.h"
 #ifdef USE_FASTMEMCPY
 #include "libvo/fastmemcpy.h"
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 8d9a2ac943..8c116ba0b7 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -39,7 +39,7 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #ifdef HAVE_MLIB
 #include "yuv2rgb_mlib.c"
diff --git a/libswscale/yuv2rgb_altivec.c b/libswscale/yuv2rgb_altivec.c
index 78662f2f12..a7af8f11e0 100644
--- a/libswscale/yuv2rgb_altivec.c
+++ b/libswscale/yuv2rgb_altivec.c
@@ -74,7 +74,7 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #undef PROFILE_THE_BEAST
 #undef INC_SCALING
diff --git a/libswscale/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c
index b19c2a5d18..69c4ad303d 100644
--- a/libswscale/yuv2rgb_mlib.c
+++ b/libswscale/yuv2rgb_mlib.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
 #include "swscale.h"
 
 static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, 
diff --git a/libvo/img_format.h b/libvo/img_format.h
deleted file mode 100644
index 7ed739c564..0000000000
--- a/libvo/img_format.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "libmpcodecs/img_format.h"
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index 844c737679..e875ba4454 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -24,7 +24,7 @@
 #include "help_mp.h"
 
 #include "vesa_lvo.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */
 #include "fastmemcpy.h"
 #include "osd.h"
diff --git a/libvo/video_out.h b/libvo/video_out.h
index b7b214f642..85b633278d 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -14,7 +14,7 @@
 #include <stdarg.h>
 
 //#include "font_load.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
 //#include "vidix/vidix.h"
 
 #define VO_EVENT_EXPOSE 1
diff --git a/mp3lib/fastmemcpy.h b/mp3lib/fastmemcpy.h
deleted file mode 100644
index 2a6f5c860d..0000000000
--- a/mp3lib/fastmemcpy.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libvo/fastmemcpy.h"
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 4146a39e85..4d79d087b1 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -29,7 +29,7 @@
 //#include "liba52/mm_accel.h"
 #include "mp_msg.h"
 
-#include "fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #ifdef ARCH_X86
 #define CAN_COMPILE_X86_ASM
diff --git a/stream/tv.c b/stream/tv.c
index e4161e67c1..2a95db7b76 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -29,7 +29,7 @@ int tv_param_on = 0;
 #include "libmpdemux/stheader.h"
 
 #include "libaf/af_format.h"
-#include "libvo/img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "libvo/fastmemcpy.h"
 
 #include "tv.h"
diff --git a/stream/tv.h b/stream/tv.h
index 6a4f03b98d..3a2d6abfb3 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -5,7 +5,7 @@ extern int tv_param_on;
 
 #ifdef USE_TV
 //#include "libao2/afmt.h"
-//#include "libvo/img_format.h"
+//#include "libmpcodecs/img_format.h"
 //#include "libvo/fastmemcpy.h"
 //#include "mp_msg.h"
 
diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c
index 7732d017de..2c13f90bc1 100644
--- a/stream/tvi_bsdbt848.c
+++ b/stream/tvi_bsdbt848.c
@@ -63,7 +63,7 @@
 #endif
 
 #include "libaf/af_format.h"
-#include "libvo/img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "tv.h"
 
 /* information about this file */
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c
index 152ce0938c..8dcf7f89c1 100644
--- a/stream/tvi_dummy.c
+++ b/stream/tvi_dummy.c
@@ -5,7 +5,7 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "libvo/img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "tv.h"
 
 /* information about this file */
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c
index 1fa3874228..f12ffa77e3 100644
--- a/stream/tvi_v4l.c
+++ b/stream/tvi_v4l.c
@@ -40,7 +40,7 @@
 
 #include "mp_msg.h"
 #include "libaf/af_format.h"
-#include "libvo/img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "libvo/fastmemcpy.h"
 #include "libvo/videodev_mjpeg.h"
 
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 049d34e37c..8456fe7211 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -41,7 +41,7 @@ known issues:
 #include <linux/types.h>
 #include <linux/videodev2.h>
 #include "mp_msg.h"
-#include "libvo/img_format.h"
+#include "libmpcodecs/img_format.h"
 #include "libaf/af_format.h"
 #include "tv.h"
 #include "audio_in.h"