Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19437 b3059339-0415-0410-9bf9-f77b7e298cf2

10 files changed, 19 insertions, 19 deletions

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"