[MPlayer-cvslog] r25248 - in trunk/libvo: vo_3dfx.c vo_aa.c vo_bl.c vo_caca.c vo_dfbmga.c vo_dga.c vo_directfb2.c vo_directx.c vo_dxr2.c vo_dxr3.c vo_fbdev2.c vo_ggi.c vo_gif89a.c vo_gl.c vo_gl2.c vo_ivtv.c vo_jpeg.c vo_md5sum.c vo_mga.c vo_mpegpes.c vo_null.c vo_png.c vo_pnm.c vo_quartz.c vo_s3fb.c vo_sdl.c vo_tdfx_vid.c vo_tdfxfb.c vo_tga.c vo_v4l2.c vo_x11.c vo_xmga.c vo_xv.c vo_xvmc.c vo_xvr100.c vo_yuv4mpeg.c vo_zr.c vo_zr2.c
reimar
subversion at mplayerhq.hu
Sun Dec 2 15:39:16 CET 2007
Author: reimar
Date: Sun Dec 2 15:39:15 2007
New Revision: 25248
Log:
Mark the vo_functions_t definitions as const where possible.
This is not possible for xover and anything supporting vidix
due to horrible hacks.
Modified:
trunk/libvo/vo_3dfx.c
trunk/libvo/vo_aa.c
trunk/libvo/vo_bl.c
trunk/libvo/vo_caca.c
trunk/libvo/vo_dfbmga.c
trunk/libvo/vo_dga.c
trunk/libvo/vo_directfb2.c
trunk/libvo/vo_directx.c
trunk/libvo/vo_dxr2.c
trunk/libvo/vo_dxr3.c
trunk/libvo/vo_fbdev2.c
trunk/libvo/vo_ggi.c
trunk/libvo/vo_gif89a.c
trunk/libvo/vo_gl.c
trunk/libvo/vo_gl2.c
trunk/libvo/vo_ivtv.c
trunk/libvo/vo_jpeg.c
trunk/libvo/vo_md5sum.c
trunk/libvo/vo_mga.c
trunk/libvo/vo_mpegpes.c
trunk/libvo/vo_null.c
trunk/libvo/vo_png.c
trunk/libvo/vo_pnm.c
trunk/libvo/vo_quartz.c
trunk/libvo/vo_s3fb.c
trunk/libvo/vo_sdl.c
trunk/libvo/vo_tdfx_vid.c
trunk/libvo/vo_tdfxfb.c
trunk/libvo/vo_tga.c
trunk/libvo/vo_v4l2.c
trunk/libvo/vo_x11.c
trunk/libvo/vo_xmga.c
trunk/libvo/vo_xv.c
trunk/libvo/vo_xvmc.c
trunk/libvo/vo_xvr100.c
trunk/libvo/vo_yuv4mpeg.c
trunk/libvo/vo_zr.c
trunk/libvo/vo_zr2.c
Modified: trunk/libvo/vo_3dfx.c
==============================================================================
--- trunk/libvo/vo_3dfx.c (original)
+++ trunk/libvo/vo_3dfx.c Sun Dec 2 15:39:15 2007
@@ -59,7 +59,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(3dfx)
+const LIBVO_EXTERN(3dfx)
static uint32_t is_fullscreen = 1;
Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c (original)
+++ trunk/libvo/vo_aa.c Sun Dec 2 15:39:15 2007
@@ -51,7 +51,7 @@
""
};
-LIBVO_EXTERN(aa)
+const LIBVO_EXTERN(aa)
/* aa's main context we use */
aa_context *c;
Modified: trunk/libvo/vo_bl.c
==============================================================================
--- trunk/libvo/vo_bl.c (original)
+++ trunk/libvo/vo_bl.c Sun Dec 2 15:39:15 2007
@@ -55,7 +55,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN (bl)
+const LIBVO_EXTERN (bl)
/* General variables */
Modified: trunk/libvo/vo_caca.c
==============================================================================
--- trunk/libvo/vo_caca.c (original)
+++ trunk/libvo/vo_caca.c Sun Dec 2 15:39:15 2007
@@ -45,7 +45,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN (caca)
+const LIBVO_EXTERN (caca)
/* caca stuff */
static struct caca_bitmap *cbitmap = NULL;
Modified: trunk/libvo/vo_dfbmga.c
==============================================================================
--- trunk/libvo/vo_dfbmga.c (original)
+++ trunk/libvo/vo_dfbmga.c Sun Dec 2 15:39:15 2007
@@ -48,7 +48,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(dfbmga)
+const LIBVO_EXTERN(dfbmga)
/******************************
* directfb *
Modified: trunk/libvo/vo_dga.c
==============================================================================
--- trunk/libvo/vo_dga.c (original)
+++ trunk/libvo/vo_dga.c Sun Dec 2 15:39:15 2007
@@ -45,7 +45,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(dga)
+const LIBVO_EXTERN(dga)
//------------------------------------------------------------------
//#define BITSPP (vo_dga_modes[vo_dga_active_mode].vdm_bitspp)
//#define BYTESPP (vo_dga_modes[vo_dga_active_mode].vdm_bytespp)
Modified: trunk/libvo/vo_directfb2.c
==============================================================================
--- trunk/libvo/vo_directfb2.c (original)
+++ trunk/libvo/vo_directfb2.c Sun Dec 2 15:39:15 2007
@@ -65,7 +65,7 @@ static const vo_info_t info = {
"v 2.0 (for DirectFB version >=0.9.13)"
};
-LIBVO_EXTERN(directfb)
+const LIBVO_EXTERN(directfb)
/******************************
* vo_directfb globals *
Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c (original)
+++ trunk/libvo/vo_directx.c Sun Dec 2 15:39:15 2007
@@ -143,7 +143,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(directx)
+const LIBVO_EXTERN(directx)
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
unsigned char *srca, int stride)
Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c (original)
+++ trunk/libvo/vo_dxr2.c Sun Dec 2 15:39:15 2007
@@ -139,7 +139,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN (dxr2)
+const LIBVO_EXTERN (dxr2)
static char *ucodesearchpath[] = {
"/usr/local/lib/dxr2/dvd12.ux",
Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c (original)
+++ trunk/libvo/vo_dxr3.c Sun Dec 2 15:39:15 2007
@@ -159,7 +159,7 @@ static const vo_info_t info =
"David Holm <dholm at iname.com>",
""
};
-LIBVO_EXTERN (dxr3)
+const LIBVO_EXTERN (dxr3)
/* Resolutions and positions */
static int v_width, v_height;
Modified: trunk/libvo/vo_fbdev2.c
==============================================================================
--- trunk/libvo/vo_fbdev2.c (original)
+++ trunk/libvo/vo_fbdev2.c Sun Dec 2 15:39:15 2007
@@ -29,7 +29,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(fbdev2)
+const LIBVO_EXTERN(fbdev2)
static void set_bpp(struct fb_var_screeninfo *p, int bpp)
{
Modified: trunk/libvo/vo_ggi.c
==============================================================================
--- trunk/libvo/vo_ggi.c (original)
+++ trunk/libvo/vo_ggi.c Sun Dec 2 15:39:15 2007
@@ -44,7 +44,7 @@ static const vo_info_t info =
"major"
};
-LIBVO_EXTERN(ggi)
+const LIBVO_EXTERN(ggi)
static struct ggi_conf_s {
Modified: trunk/libvo/vo_gif89a.c
==============================================================================
--- trunk/libvo/vo_gif89a.c (original)
+++ trunk/libvo/vo_gif89a.c Sun Dec 2 15:39:15 2007
@@ -68,7 +68,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(gif89a)
+const LIBVO_EXTERN(gif89a)
// how many frames per second we are aiming for during output.
Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c (original)
+++ trunk/libvo/vo_gl.c Sun Dec 2 15:39:15 2007
@@ -27,7 +27,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(gl)
+const LIBVO_EXTERN(gl)
#ifdef GL_WIN32
static int gl_vinfo = 0;
Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c (original)
+++ trunk/libvo/vo_gl2.c Sun Dec 2 15:39:15 2007
@@ -41,7 +41,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(gl2)
+const LIBVO_EXTERN(gl2)
/* local data */
static unsigned char *ImageData=NULL;
Modified: trunk/libvo/vo_ivtv.c
==============================================================================
--- trunk/libvo/vo_ivtv.c (original)
+++ trunk/libvo/vo_ivtv.c Sun Dec 2 15:39:15 2007
@@ -69,7 +69,7 @@ static const vo_info_t info =
"Benjamin Zores",
""
};
-LIBVO_EXTERN (ivtv)
+const LIBVO_EXTERN (ivtv)
/* ivtv internals */
Modified: trunk/libvo/vo_jpeg.c
==============================================================================
--- trunk/libvo/vo_jpeg.c (original)
+++ trunk/libvo/vo_jpeg.c Sun Dec 2 15:39:15 2007
@@ -67,7 +67,7 @@ static const vo_info_t info=
""
};
-LIBVO_EXTERN (jpeg)
+const LIBVO_EXTERN (jpeg)
/* ------------------------------------------------------------------------- */
Modified: trunk/libvo/vo_md5sum.c
==============================================================================
--- trunk/libvo/vo_md5sum.c (original)
+++ trunk/libvo/vo_md5sum.c Sun Dec 2 15:39:15 2007
@@ -66,7 +66,7 @@ static const vo_info_t info=
""
};
-LIBVO_EXTERN (md5sum)
+const LIBVO_EXTERN (md5sum)
/* ------------------------------------------------------------------------- */
Modified: trunk/libvo/vo_mga.c
==============================================================================
--- trunk/libvo/vo_mga.c (original)
+++ trunk/libvo/vo_mga.c Sun Dec 2 15:39:15 2007
@@ -30,7 +30,7 @@ static const vo_info_t info =
"Based on some code by Aaron Holtzman <aholtzma at ess.engr.uvic.ca>"
};
-LIBVO_EXTERN(mga)
+const LIBVO_EXTERN(mga)
#include "mga_common.c"
Modified: trunk/libvo/vo_mpegpes.c
==============================================================================
--- trunk/libvo/vo_mpegpes.c (original)
+++ trunk/libvo/vo_mpegpes.c Sun Dec 2 15:39:15 2007
@@ -76,7 +76,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN (mpegpes)
+const LIBVO_EXTERN (mpegpes)
static int
config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
Modified: trunk/libvo/vo_null.c
==============================================================================
--- trunk/libvo/vo_null.c (original)
+++ trunk/libvo/vo_null.c Sun Dec 2 15:39:15 2007
@@ -38,7 +38,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(null)
+const LIBVO_EXTERN(null)
static uint32_t image_width, image_height;
Modified: trunk/libvo/vo_png.c
==============================================================================
--- trunk/libvo/vo_png.c (original)
+++ trunk/libvo/vo_png.c Sun Dec 2 15:39:15 2007
@@ -30,7 +30,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN (png)
+const LIBVO_EXTERN (png)
static int z_compression = Z_NO_COMPRESSION;
static int framenum = 0;
Modified: trunk/libvo/vo_pnm.c
==============================================================================
--- trunk/libvo/vo_pnm.c (original)
+++ trunk/libvo/vo_pnm.c Sun Dec 2 15:39:15 2007
@@ -73,7 +73,7 @@ static const vo_info_t info=
""
};
-LIBVO_EXTERN (pnm)
+const LIBVO_EXTERN (pnm)
/* ------------------------------------------------------------------------- */
Modified: trunk/libvo/vo_quartz.c
==============================================================================
--- trunk/libvo/vo_quartz.c (original)
+++ trunk/libvo/vo_quartz.c Sun Dec 2 15:39:15 2007
@@ -46,7 +46,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(quartz)
+const LIBVO_EXTERN(quartz)
static uint32_t image_depth;
static uint32_t image_format;
Modified: trunk/libvo/vo_s3fb.c
==============================================================================
--- trunk/libvo/vo_s3fb.c (original)
+++ trunk/libvo/vo_s3fb.c Sun Dec 2 15:39:15 2007
@@ -37,7 +37,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(s3fb)
+const LIBVO_EXTERN(s3fb)
typedef struct vga_type {
int cr38, cr39, cr53;
Modified: trunk/libvo/vo_sdl.c
==============================================================================
--- trunk/libvo/vo_sdl.c (original)
+++ trunk/libvo/vo_sdl.c Sun Dec 2 15:39:15 2007
@@ -134,7 +134,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(sdl)
+const LIBVO_EXTERN(sdl)
#include <SDL.h>
//#include <SDL/SDL_syswm.h>
Modified: trunk/libvo/vo_tdfx_vid.c
==============================================================================
--- trunk/libvo/vo_tdfx_vid.c (original)
+++ trunk/libvo/vo_tdfx_vid.c Sun Dec 2 15:39:15 2007
@@ -51,7 +51,7 @@ static const vo_info_t info =
//#define VERBOSE
-LIBVO_EXTERN(tdfx_vid)
+const LIBVO_EXTERN(tdfx_vid)
static tdfx_vid_config_t tdfx_cfg;
Modified: trunk/libvo/vo_tdfxfb.c
==============================================================================
--- trunk/libvo/vo_tdfxfb.c (original)
+++ trunk/libvo/vo_tdfxfb.c Sun Dec 2 15:39:15 2007
@@ -55,7 +55,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN(tdfxfb)
+const LIBVO_EXTERN(tdfxfb)
/* Some registers on the card */
#define S2S_STRECH_BLT 2 // BLT + Strech
Modified: trunk/libvo/vo_tga.c
==============================================================================
--- trunk/libvo/vo_tga.c (original)
+++ trunk/libvo/vo_tga.c Sun Dec 2 15:39:15 2007
@@ -46,7 +46,7 @@ static const vo_info_t info =
};
-LIBVO_EXTERN (tga)
+const LIBVO_EXTERN (tga)
/* locals vars */
static int frame_num = 0;
Modified: trunk/libvo/vo_v4l2.c
==============================================================================
--- trunk/libvo/vo_v4l2.c (original)
+++ trunk/libvo/vo_v4l2.c Sun Dec 2 15:39:15 2007
@@ -63,7 +63,7 @@ static const vo_info_t info =
"Benjamin Zores",
""
};
-LIBVO_EXTERN (v4l2)
+const LIBVO_EXTERN (v4l2)
int
v4l2_write (unsigned char *data, int len)
Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c (original)
+++ trunk/libvo/vo_x11.c Sun Dec 2 15:39:15 2007
@@ -57,7 +57,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(x11)
+const LIBVO_EXTERN(x11)
/* private prototypes */
static void Display_Image(XImage * myximage, unsigned char *ImageData);
static void (*draw_alpha_fnc) (int x0, int y0, int w, int h,
Modified: trunk/libvo/vo_xmga.c
==============================================================================
--- trunk/libvo/vo_xmga.c (original)
+++ trunk/libvo/vo_xmga.c Sun Dec 2 15:39:15 2007
@@ -54,7 +54,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(xmga)
+const LIBVO_EXTERN(xmga)
static XGCValues wGCV;
static uint32_t mDepth;
Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c (original)
+++ trunk/libvo/vo_xv.c Sun Dec 2 15:39:15 2007
@@ -54,7 +54,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(xv)
+const LIBVO_EXTERN(xv)
#ifdef HAVE_SHM
#include <sys/ipc.h>
#include <sys/shm.h>
Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c (original)
+++ trunk/libvo/vo_xvmc.c Sun Dec 2 15:39:15 2007
@@ -126,7 +126,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(xvmc);
+const LIBVO_EXTERN(xvmc);
//shm stuff from vo_xv
#ifdef HAVE_SHM
Modified: trunk/libvo/vo_xvr100.c
==============================================================================
--- trunk/libvo/vo_xvr100.c (original)
+++ trunk/libvo/vo_xvr100.c Sun Dec 2 15:39:15 2007
@@ -59,7 +59,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(xvr100)
+const LIBVO_EXTERN(xvr100)
#define PFB_VRAM_MMAPBASE 0x08000000
#define PFB_VRAM_MMAPLEN 0x04000000 /* depends on memory size */
Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c (original)
+++ trunk/libvo/vo_yuv4mpeg.c Sun Dec 2 15:39:15 2007
@@ -53,7 +53,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN (yuv4mpeg)
+const LIBVO_EXTERN (yuv4mpeg)
static int image_width = 0;
static int image_height = 0;
Modified: trunk/libvo/vo_zr.c
==============================================================================
--- trunk/libvo/vo_zr.c (original)
+++ trunk/libvo/vo_zr.c Sun Dec 2 15:39:15 2007
@@ -38,7 +38,7 @@ static const vo_info_t info =
""
};
-LIBVO_EXTERN (zr)
+const LIBVO_EXTERN (zr)
#define ZR_MAX_DEVICES 4
/* General variables */
Modified: trunk/libvo/vo_zr2.c
==============================================================================
--- trunk/libvo/vo_zr2.c (original)
+++ trunk/libvo/vo_zr2.c Sun Dec 2 15:39:15 2007
@@ -36,7 +36,7 @@ static const vo_info_t info = {
""
};
-LIBVO_EXTERN(zr2)
+const LIBVO_EXTERN(zr2)
typedef struct {
/* options */
More information about the MPlayer-cvslog
mailing list