r19437 - in trunk: configure libmenu/Makefile libmenu/menu.c libmenu/menu_cmdlist.c libmenu/menu_console.c libmenu/menu_dvbin.c libmenu/menu_filesel.c libmenu/menu_list.c libmenu/menu_param.c libmenu/menu_pt.c libmenu/menu_txt.c libswscale/swscale-example.c libswscale/swscale.c libswscale/yuv2rgb.c libswscale/yuv2rgb_altivec.c libswscale/yuv2rgb_mlib.c libvo/img_format.h libvo/vesa_lvo.c libvo/video_out.h mp3lib/fastmemcpy.h mp3lib/sr1.c stream/tv.c stream/tv.h stream/tvi_bsdbt848.c stream/
Author: diego Date: Fri Aug 18 15:58:03 2006 New Revision: 19437 Removed: trunk/libvo/img_format.h trunk/mp3lib/fastmemcpy.h Modified: trunk/configure trunk/libmenu/Makefile trunk/libmenu/menu.c trunk/libmenu/menu_cmdlist.c trunk/libmenu/menu_console.c trunk/libmenu/menu_dvbin.c trunk/libmenu/menu_filesel.c trunk/libmenu/menu_list.c trunk/libmenu/menu_param.c trunk/libmenu/menu_pt.c trunk/libmenu/menu_txt.c trunk/libswscale/swscale-example.c trunk/libswscale/swscale.c trunk/libswscale/yuv2rgb.c trunk/libswscale/yuv2rgb_altivec.c trunk/libswscale/yuv2rgb_mlib.c trunk/libvo/vesa_lvo.c trunk/libvo/video_out.h trunk/mp3lib/sr1.c trunk/stream/tv.c trunk/stream/tv.h trunk/stream/tvi_bsdbt848.c trunk/stream/tvi_dummy.c trunk/stream/tvi_v4l.c trunk/stream/tvi_v4l2.c Log: Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Aug 18 15:58:03 2006 @@ -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 Modified: trunk/libmenu/Makefile ============================================================================== --- trunk/libmenu/Makefile (original) +++ trunk/libmenu/Makefile Fri Aug 18 15:58:03 2006 @@ -18,7 +18,7 @@ endif OBJS=$(SRCS:.c=.o) -CFLAGS = -I. -I.. -I../libmpcodecs $(OPTFLAGS) +CFLAGS = -I. -I.. $(OPTFLAGS) .SUFFIXES: .c .o Modified: trunk/libmenu/menu.c ============================================================================== --- trunk/libmenu/menu.c (original) +++ trunk/libmenu/menu.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_cmdlist.c ============================================================================== --- trunk/libmenu/menu_cmdlist.c (original) +++ trunk/libmenu/menu_cmdlist.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_console.c ============================================================================== --- trunk/libmenu/menu_console.c (original) +++ trunk/libmenu/menu_console.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_dvbin.c ============================================================================== --- trunk/libmenu/menu_dvbin.c (original) +++ trunk/libmenu/menu_dvbin.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_filesel.c ============================================================================== --- trunk/libmenu/menu_filesel.c (original) +++ trunk/libmenu/menu_filesel.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_list.c ============================================================================== --- trunk/libmenu/menu_list.c (original) +++ trunk/libmenu/menu_list.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_param.c ============================================================================== --- trunk/libmenu/menu_param.c (original) +++ trunk/libmenu/menu_param.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_pt.c ============================================================================== --- trunk/libmenu/menu_pt.c (original) +++ trunk/libmenu/menu_pt.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libmenu/menu_txt.c ============================================================================== --- trunk/libmenu/menu_txt.c (original) +++ trunk/libmenu/menu_txt.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c (original) +++ trunk/libswscale/swscale-example.c Fri Aug 18 15:58:03 2006 @@ -23,7 +23,7 @@ #include <stdarg.h> #include "swscale.h" -#include "img_format.h" +#include "libmpcodecs/img_format.h" static int testFormat[]={ IMGFMT_YVU9, Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c (original) +++ trunk/libswscale/swscale.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libswscale/yuv2rgb.c ============================================================================== --- trunk/libswscale/yuv2rgb.c (original) +++ trunk/libswscale/yuv2rgb.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libswscale/yuv2rgb_altivec.c ============================================================================== --- trunk/libswscale/yuv2rgb_altivec.c (original) +++ trunk/libswscale/yuv2rgb_altivec.c Fri Aug 18 15:58:03 2006 @@ -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 Modified: trunk/libswscale/yuv2rgb_mlib.c ============================================================================== --- trunk/libswscale/yuv2rgb_mlib.c (original) +++ trunk/libswscale/yuv2rgb_mlib.c Fri Aug 18 15:58:03 2006 @@ -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, Modified: trunk/libvo/vesa_lvo.c ============================================================================== --- trunk/libvo/vesa_lvo.c (original) +++ trunk/libvo/vesa_lvo.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h (original) +++ trunk/libvo/video_out.h Fri Aug 18 15:58:03 2006 @@ -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 Modified: trunk/mp3lib/sr1.c ============================================================================== --- trunk/mp3lib/sr1.c (original) +++ trunk/mp3lib/sr1.c Fri Aug 18 15:58:03 2006 @@ -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 Modified: trunk/stream/tv.c ============================================================================== --- trunk/stream/tv.c (original) +++ trunk/stream/tv.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/stream/tv.h ============================================================================== --- trunk/stream/tv.h (original) +++ trunk/stream/tv.h Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/stream/tvi_bsdbt848.c ============================================================================== --- trunk/stream/tvi_bsdbt848.c (original) +++ trunk/stream/tvi_bsdbt848.c Fri Aug 18 15:58:03 2006 @@ -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 */ Modified: trunk/stream/tvi_dummy.c ============================================================================== --- trunk/stream/tvi_dummy.c (original) +++ trunk/stream/tvi_dummy.c Fri Aug 18 15:58:03 2006 @@ -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 */ Modified: trunk/stream/tvi_v4l.c ============================================================================== --- trunk/stream/tvi_v4l.c (original) +++ trunk/stream/tvi_v4l.c Fri Aug 18 15:58:03 2006 @@ -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" Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c (original) +++ trunk/stream/tvi_v4l2.c Fri Aug 18 15:58:03 2006 @@ -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"
participants (1)
-
diego