diff options
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/Makefile | 2 | ||||
-rw-r--r-- | libvo/img_format.h | 76 | ||||
-rw-r--r-- | libvo/mga_common.c | 1 | ||||
-rw-r--r-- | libvo/video_out_internal.h | 1 | ||||
-rw-r--r-- | libvo/vo_directfb.c | 1 | ||||
-rw-r--r-- | libvo/vo_null.c | 2 | ||||
-rw-r--r-- | libvo/vo_sdl.c | 1 | ||||
-rw-r--r-- | libvo/vo_tdfxfb.c | 1 | ||||
-rw-r--r-- | libvo/vo_x11.c | 2 | ||||
-rw-r--r-- | libvo/vo_xv.c | 1 | ||||
-rw-r--r-- | libvo/vosub_vidix.c | 2 |
11 files changed, 6 insertions, 84 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index 9a7d33cbf5..c621b9e294 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -3,7 +3,7 @@ include config.mak LIBNAME = libvo.a -SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) img_format.c sub.c +SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c OBJS=$(SRCS:.c=.o) ifeq ($(VIDIX),yes) diff --git a/libvo/img_format.h b/libvo/img_format.h index 6dd00a2060..0ed3c65aff 100644 --- a/libvo/img_format.h +++ b/libvo/img_format.h @@ -1,76 +1,2 @@ -#ifndef __IMG_FORMAT_H -#define __IMG_FORMAT_H - -/* RGB/BGR Formats */ - -#define IMGFMT_RGB_MASK 0xFFFFFF00 -#define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8)) -#define IMGFMT_RGB8 (IMGFMT_RGB|8) -#define IMGFMT_RGB15 (IMGFMT_RGB|15) -#define IMGFMT_RGB16 (IMGFMT_RGB|16) -#define IMGFMT_RGB24 (IMGFMT_RGB|24) -#define IMGFMT_RGB32 (IMGFMT_RGB|32) - -#define IMGFMT_BGR_MASK 0xFFFFFF00 -#define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8)) -#define IMGFMT_BGR8 (IMGFMT_BGR|8) -#define IMGFMT_BGR15 (IMGFMT_BGR|15) -#define IMGFMT_BGR16 (IMGFMT_BGR|16) -#define IMGFMT_BGR24 (IMGFMT_BGR|24) -#define IMGFMT_BGR32 (IMGFMT_BGR|32) - -#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB) -#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR) - -#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB) -#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR) - - -/* Planar YUV Formats */ - -#define IMGFMT_YVU9 0x39555659 -#define IMGFMT_IF09 0x39304649 -#define IMGFMT_YV12 0x32315659 -#define IMGFMT_I420 0x30323449 -#define IMGFMT_IYUV 0x56555949 -#define IMGFMT_CLPL 0x4C504C43 -#define IMGFMT_Y800 0x30303859 -#define IMGFMT_Y8 0x20203859 - -/* Packed YUV Formats */ - -#define IMGFMT_IUYV 0x56595549 -#define IMGFMT_IY41 0x31435949 -#define IMGFMT_IYU1 0x31555949 -#define IMGFMT_IYU2 0x32555949 -#define IMGFMT_UYVY 0x59565955 -#define IMGFMT_UYNV 0x564E5955 -#define IMGFMT_cyuv 0x76757963 -#define IMGFMT_Y422 0x32323459 -#define IMGFMT_YUY2 0x32595559 -#define IMGFMT_YUNV 0x564E5559 -#define IMGFMT_YVYU 0x55595659 -#define IMGFMT_Y41P 0x50313459 -#define IMGFMT_Y211 0x31313259 -#define IMGFMT_Y41T 0x54313459 -#define IMGFMT_Y42T 0x54323459 -#define IMGFMT_V422 0x32323456 -#define IMGFMT_V655 0x35353656 -#define IMGFMT_CLJR 0x524A4C43 -#define IMGFMT_YUVP 0x50565559 -#define IMGFMT_UYVP 0x50565955 - -/* Compressed Formats */ -#define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S')) - -typedef struct { - void* data; - int size; - int id; // stream id. usually 0x1E0 - int timestamp; // pts, 90000 Hz counter based -} vo_mpegpes_t; - -char *vo_format_name(int format); - -#endif +#include "../libmpcodecs/img_format.h" diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 978b830ed4..91691984e6 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -1,7 +1,6 @@ #include "fastmemcpy.h" #include "../mmx_defs.h" -#include "../mp_image.h" #include "../postproc/rgb2rgb.h" // mga_vid drawing functions diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h index 33401caf3e..b656135c38 100644 --- a/libvo/video_out_internal.h +++ b/libvo/video_out_internal.h @@ -22,6 +22,7 @@ */ #include "../libmpcodecs/vfcap.h" +#include "../libmpcodecs/mp_image.h" static uint32_t control(uint32_t request, void *data, ...); static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, diff --git a/libvo/vo_directfb.c b/libvo/vo_directfb.c index c511411077..c5402e8418 100644 --- a/libvo/vo_directfb.c +++ b/libvo/vo_directfb.c @@ -59,7 +59,6 @@ #include "sub.h" #include "../postproc/rgb2rgb.h" #include "aspect.h" -#include "../mp_image.h" LIBVO_EXTERN(directfb) diff --git a/libvo/vo_null.c b/libvo/vo_null.c index e0d68ea661..a0984d6742 100644 --- a/libvo/vo_null.c +++ b/libvo/vo_null.c @@ -21,6 +21,8 @@ * */ +#include <stdio.h> +#include <stdlib.h> #include <errno.h> #include "config.h" #include "video_out.h" diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 14a2879601..8586b7b4f3 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -114,7 +114,6 @@ #include "fastmemcpy.h" #include "sub.h" #include "aspect.h" -#include "../mp_image.h" #ifdef HAVE_X11 #include <X11/Xlib.h> diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c index ca2734985f..418389d243 100644 --- a/libvo/vo_tdfxfb.c +++ b/libvo/vo_tdfxfb.c @@ -37,7 +37,6 @@ #include "fastmemcpy.h" #include "video_out.h" #include "video_out_internal.h" -#include "mp_image.h" #include "drivers/3dfx.h" LIBVO_EXTERN(tdfxfb) diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 16907d8ef5..73b44f8ca8 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -45,8 +45,6 @@ LIBVO_EXTERN( x11 ) #include "../mp_msg.h" -#include "../mp_image.h" - static vo_info_t vo_info = { "X11 ( XImage/Shm )", diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 13d4549f12..cf04b1cfa9 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -39,7 +39,6 @@ LIBVO_EXTERN(xv) #include "aspect.h" #include "../postproc/rgb2rgb.h" -#include "../mp_image.h" static vo_info_t vo_info = { diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index bf6acf3952..67db7c8878 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -29,9 +29,9 @@ #include "fastmemcpy.h" #include "osd.h" #include "video_out.h" -#include "../mp_image.h" #include "../libmpcodecs/vfcap.h" +#include "../libmpcodecs/mp_image.h" #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */ #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */ |