# HG changeset patch
# User diego
# Date 1155909483 0
# Node ID ac69ba536915cb649310499607144ef2f21e1485
# Parent  de5065d3ce743fa3a7801ff9dca80f7af6cfad09
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.

diff -r de5065d3ce74 -r ac69ba536915 configure
--- a/configure	Fri Aug 18 12:20:43 2006 +0000
+++ b/configure	Fri Aug 18 13:58:03 2006 +0000
@@ -7264,7 +7264,7 @@
 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 -r de5065d3ce74 -r ac69ba536915 libmenu/Makefile
--- a/libmenu/Makefile	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/Makefile	Fri Aug 18 13:58:03 2006 +0000
@@ -18,7 +18,7 @@
 endif
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = -I. -I.. -I../libmpcodecs $(OPTFLAGS)
+CFLAGS  = -I. -I.. $(OPTFLAGS)
 
 .SUFFIXES: .c .o
 
diff -r de5065d3ce74 -r ac69ba536915 libmenu/menu.c
--- a/libmenu/menu.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_cmdlist.c
--- a/libmenu/menu_cmdlist.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_cmdlist.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_console.c
--- a/libmenu/menu_console.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_console.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_dvbin.c
--- a/libmenu/menu_dvbin.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_dvbin.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_filesel.c
--- a/libmenu/menu_filesel.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_filesel.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_list.c
--- a/libmenu/menu_list.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_list.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_param.c
--- a/libmenu/menu_param.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_param.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_pt.c
--- a/libmenu/menu_pt.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_pt.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libmenu/menu_txt.c
--- a/libmenu/menu_txt.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libmenu/menu_txt.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libswscale/swscale-example.c
--- a/libswscale/swscale-example.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libswscale/swscale-example.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libswscale/swscale.c
--- a/libswscale/swscale.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libswscale/swscale.c	Fri Aug 18 13:58:03 2006 +0000
@@ -71,7 +71,7 @@
 #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 -r de5065d3ce74 -r ac69ba536915 libswscale/yuv2rgb.c
--- a/libswscale/yuv2rgb.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libswscale/yuv2rgb.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libswscale/yuv2rgb_altivec.c
--- a/libswscale/yuv2rgb_altivec.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libswscale/yuv2rgb_altivec.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libswscale/yuv2rgb_mlib.c
--- a/libswscale/yuv2rgb_mlib.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libswscale/yuv2rgb_mlib.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libvo/img_format.h
--- a/libvo/img_format.h	Fri Aug 18 12:20:43 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-#include "libmpcodecs/img_format.h"
diff -r de5065d3ce74 -r ac69ba536915 libvo/vesa_lvo.c
--- a/libvo/vesa_lvo.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/libvo/vesa_lvo.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 libvo/video_out.h
--- a/libvo/video_out.h	Fri Aug 18 12:20:43 2006 +0000
+++ b/libvo/video_out.h	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 mp3lib/fastmemcpy.h
--- a/mp3lib/fastmemcpy.h	Fri Aug 18 12:20:43 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "../libvo/fastmemcpy.h"
diff -r de5065d3ce74 -r ac69ba536915 mp3lib/sr1.c
--- a/mp3lib/sr1.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/mp3lib/sr1.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 stream/tv.c
--- a/stream/tv.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tv.c	Fri Aug 18 13:58:03 2006 +0000
@@ -29,7 +29,7 @@
 #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 -r de5065d3ce74 -r ac69ba536915 stream/tv.h
--- a/stream/tv.h	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tv.h	Fri Aug 18 13:58:03 2006 +0000
@@ -5,7 +5,7 @@
 
 #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 -r de5065d3ce74 -r ac69ba536915 stream/tvi_bsdbt848.c
--- a/stream/tvi_bsdbt848.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tvi_bsdbt848.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 stream/tvi_dummy.c
--- a/stream/tvi_dummy.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tvi_dummy.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 stream/tvi_v4l.c
--- a/stream/tvi_v4l.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tvi_v4l.c	Fri Aug 18 13:58:03 2006 +0000
@@ -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 -r de5065d3ce74 -r ac69ba536915 stream/tvi_v4l2.c
--- a/stream/tvi_v4l2.c	Fri Aug 18 12:20:43 2006 +0000
+++ b/stream/tvi_v4l2.c	Fri Aug 18 13:58:03 2006 +0000
@@ -41,7 +41,7 @@
 #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"