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

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

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
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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,

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"

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"

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

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, 

libvo/img_format.h

@@ -1,2 +0,0 @@
-
-#include "libmpcodecs/img_format.h"

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"

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

mp3lib/fastmemcpy.h

@@ -1 +0,0 @@
-#include "../libvo/fastmemcpy.h"

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

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"

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"
 

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 */

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 */

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"
 

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"