diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-06 11:22:40 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-06 11:22:40 +0000 |
commit | dfe91abaa222060b78bfe48add1225e083209911 (patch) | |
tree | 220e45b8aa9a455075b527d9ded702ace4647903 /libvo | |
parent | adbc62c736e514f39a5652bbc1ff1c4b124a236f (diff) | |
download | mpv-dfe91abaa222060b78bfe48add1225e083209911.tar.bz2 mpv-dfe91abaa222060b78bfe48add1225e083209911.tar.xz |
Move yuv2rgb to postprocess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2733 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/Makefile | 5 | ||||
-rw-r--r-- | libvo/vo_aa.c | 2 | ||||
-rw-r--r-- | libvo/vo_dga.c | 6 | ||||
-rw-r--r-- | libvo/vo_dxr3.c | 2 | ||||
-rw-r--r-- | libvo/vo_fbdev.c | 1 | ||||
-rw-r--r-- | libvo/vo_fsdga.c | 2 | ||||
-rw-r--r-- | libvo/vo_ggi.c | 2 | ||||
-rw-r--r-- | libvo/vo_gl.c | 2 | ||||
-rw-r--r-- | libvo/vo_gl2.c | 2 | ||||
-rw-r--r-- | libvo/vo_png.c | 2 | ||||
-rw-r--r-- | libvo/vo_svga.c | 2 | ||||
-rw-r--r-- | libvo/vo_tdfxfb.c | 2 | ||||
-rw-r--r-- | libvo/vo_vesa.c | 1 | ||||
-rw-r--r-- | libvo/vo_x11.c | 1 |
14 files changed, 13 insertions, 19 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index 7964492963..71bba44293 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -3,17 +3,16 @@ include config.mak LIBNAME = libvo.a -SRCS=aspect.c aclib.c osd.c font_load.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c +SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c OBJS=$(SRCS:.c=.o) ifeq ($(TARGET_ARCH_X86),yes) -SRCS += yuv2rgb_mmx.c ifeq ($(TARGET_OS),Linux) SRCS += vo_vesa.c endif endif -CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(MLIB_INC) $(DVB_INC) -DMPG12PLAY #-Wall +CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall # -I/usr/X11R6/include/ .SUFFIXES: .c .o diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index e4d49b4947..e3b9c3855d 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -25,7 +25,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #include "sub.h" #include "linux/keycodes.h" diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index da71695641..50d5b2c704 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -23,8 +23,8 @@ * - works only on x86 architectures * * $Log$ - * Revision 1.32 2001/11/02 15:27:38 nick - * *** empty log message *** + * Revision 1.33 2001/11/06 11:21:08 nick + * Move yuv2rgb to postprocess * * * Revision 1.31 2001/10/30 17:04:31 nick @@ -145,7 +145,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" LIBVO_EXTERN( dga ) diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index dcb69613b1..4ed63392ca 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -24,7 +24,7 @@ #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #ifdef HAVE_MMX #include "mmx.h" #endif diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index be3a747990..bb22ab0bd2 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -27,7 +27,6 @@ #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub.h" -#include "yuv2rgb.h" #include "../postproc/rgb2rgb.h" LIBVO_EXTERN(fbdev) diff --git a/libvo/vo_fsdga.c b/libvo/vo_fsdga.c index ab5f26f5f6..ea78e7a656 100644 --- a/libvo/vo_fsdga.c +++ b/libvo/vo_fsdga.c @@ -28,7 +28,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" LIBVO_EXTERN( fsdga ) diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index f10b64f8dc..382cff14e5 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -32,7 +32,7 @@ #undef GGI_PLANAR_NOCONV #ifndef GGI_PLANAR_NOCONV -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #endif LIBVO_EXTERN (ggi) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 37c6294466..2ea0bb920c 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -28,7 +28,7 @@ LIBVO_EXTERN(gl) //#include <X11/keysym.h> #include <GL/glx.h> #include <errno.h> -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #include <GL/gl.h> diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 01fdb93406..30ca8636e5 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -22,7 +22,7 @@ LIBVO_EXTERN(gl2) //#include <X11/keysym.h> #include <GL/glx.h> #include <errno.h> -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #include <GL/gl.h> diff --git a/libvo/vo_png.c b/libvo/vo_png.c index c6ff61c0d0..26b1e1e1ef 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -22,7 +22,7 @@ #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" LIBVO_EXTERN (png) diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index fcc4721b23..a245677679 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -18,8 +18,6 @@ #include "video_out.h" #include "video_out_internal.h" -#include "yuv2rgb.h" - #include "sub.h" #include "../postproc/rgb2rgb.h" diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c index b79575f76f..aa0ea4111f 100644 --- a/libvo/vo_tdfxfb.c +++ b/libvo/vo_tdfxfb.c @@ -77,7 +77,7 @@ extern int verbose; #endif #ifdef YV12_CONV_METH -#include "yuv2rgb.h" +#include "../postproc/rgb2rgb.h" #endif static vo_info_t vo_info = diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index aa22c23899..3eade479ed 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -30,7 +30,6 @@ #endif #include "fastmemcpy.h" -#include "yuv2rgb.h" #include "sub.h" #include "linux/vbelib.h" #include "bswap.h" diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 5a49be0566..1fe561f368 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -32,7 +32,6 @@ LIBVO_EXTERN( x11 ) #include <X11/extensions/xf86vmode.h> #endif #include <errno.h> -#include "yuv2rgb.h" #include "x11_common.h" |