[Mplayer-cvslog] CVS: main/libvo Makefile,1.31,1.32 img_format.h,1.5,1.6 mga_common.c,1.30,1.31 video_out_internal.h,1.10,1.11 vo_directfb.c,1.14,1.15 vo_null.c,1.8,1.9 vo_sdl.c,1.83,1.84 vo_tdfxfb.c,1.13,1.14 vo_x11.c,1.90,1.91 vo_xv.c,1.69,1.70 vosub_vidix.c,1.42,1.43
Arpi of Ize
arpi at mplayer.dev.hu
Sat Apr 13 21:14:36 CEST 2002
Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv3720/libvo
Modified Files:
Makefile img_format.h mga_common.c video_out_internal.h
vo_directfb.c vo_null.c vo_sdl.c vo_tdfxfb.c vo_x11.c vo_xv.c
vosub_vidix.c
Log Message:
mp_image.h and img_format.h moved to libmpcodecs
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 4 Apr 2002 16:11:09 -0000 1.31
+++ Makefile 13 Apr 2002 19:14:33 -0000 1.32
@@ -3,7 +3,7 @@
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)
Index: img_format.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/img_format.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- img_format.h 29 Nov 2001 17:08:17 -0000 1.5
+++ img_format.h 13 Apr 2002 19:14:33 -0000 1.6
@@ -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"
Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mga_common.c 11 Apr 2002 21:07:00 -0000 1.30
+++ mga_common.c 13 Apr 2002 19:14:33 -0000 1.31
@@ -1,7 +1,6 @@
#include "fastmemcpy.h"
#include "../mmx_defs.h"
-#include "../mp_image.h"
#include "../postproc/rgb2rgb.h"
// mga_vid drawing functions
Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- video_out_internal.h 11 Apr 2002 21:07:00 -0000 1.10
+++ video_out_internal.h 13 Apr 2002 19:14:33 -0000 1.11
@@ -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,
Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_directfb.c 22 Mar 2002 03:22:34 -0000 1.14
+++ vo_directfb.c 13 Apr 2002 19:14:33 -0000 1.15
@@ -59,7 +59,6 @@
#include "sub.h"
#include "../postproc/rgb2rgb.h"
#include "aspect.h"
-#include "../mp_image.h"
LIBVO_EXTERN(directfb)
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_null.c 17 Feb 2002 08:24:43 -0000 1.8
+++ vo_null.c 13 Apr 2002 19:14:33 -0000 1.9
@@ -21,6 +21,8 @@
*
*/
+#include <stdio.h>
+#include <stdlib.h>
#include <errno.h>
#include "config.h"
#include "video_out.h"
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vo_sdl.c 1 Apr 2002 18:16:27 -0000 1.83
+++ vo_sdl.c 13 Apr 2002 19:14:33 -0000 1.84
@@ -114,7 +114,6 @@
#include "fastmemcpy.h"
#include "sub.h"
#include "aspect.h"
-#include "../mp_image.h"
#ifdef HAVE_X11
#include <X11/Xlib.h>
Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_tdfxfb.c 13 Apr 2002 10:04:22 -0000 1.13
+++ vo_tdfxfb.c 13 Apr 2002 19:14:33 -0000 1.14
@@ -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)
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- vo_x11.c 11 Apr 2002 21:07:00 -0000 1.90
+++ vo_x11.c 13 Apr 2002 19:14:33 -0000 1.91
@@ -45,8 +45,6 @@
#include "../mp_msg.h"
-#include "../mp_image.h"
-
static vo_info_t vo_info =
{
"X11 ( XImage/Shm )",
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vo_xv.c 11 Apr 2002 21:07:00 -0000 1.69
+++ vo_xv.c 13 Apr 2002 19:14:33 -0000 1.70
@@ -39,7 +39,6 @@
#include "aspect.h"
#include "../postproc/rgb2rgb.h"
-#include "../mp_image.h"
static vo_info_t vo_info =
{
Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vosub_vidix.c 11 Apr 2002 21:07:00 -0000 1.42
+++ vosub_vidix.c 13 Apr 2002 19:14:33 -0000 1.43
@@ -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 */
More information about the MPlayer-cvslog
mailing list