# HG changeset patch # User reimar # Date 1196606355 0 # Node ID c9e9ac2008c212674e75a0854304e42cc30c3681 # Parent e82ecde2cbd4bb47df73c1740c0d197535d46aa4 Mark the vo_functions_t definitions as const where possible. This is not possible for xover and anything supporting vidix due to horrible hacks. diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_3dfx.c --- a/libvo/vo_3dfx.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_3dfx.c Sun Dec 02 14:39:15 2007 +0000 @@ -59,7 +59,7 @@ "" }; -LIBVO_EXTERN(3dfx) +const LIBVO_EXTERN(3dfx) static uint32_t is_fullscreen = 1; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_aa.c --- a/libvo/vo_aa.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_aa.c Sun Dec 02 14:39:15 2007 +0000 @@ -51,7 +51,7 @@ "" }; -LIBVO_EXTERN(aa) +const LIBVO_EXTERN(aa) /* aa's main context we use */ aa_context *c; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_bl.c --- a/libvo/vo_bl.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_bl.c Sun Dec 02 14:39:15 2007 +0000 @@ -55,7 +55,7 @@ "" }; -LIBVO_EXTERN (bl) +const LIBVO_EXTERN (bl) /* General variables */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_caca.c --- a/libvo/vo_caca.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_caca.c Sun Dec 02 14:39:15 2007 +0000 @@ -45,7 +45,7 @@ "" }; -LIBVO_EXTERN (caca) +const LIBVO_EXTERN (caca) /* caca stuff */ static struct caca_bitmap *cbitmap = NULL; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_dfbmga.c --- a/libvo/vo_dfbmga.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_dfbmga.c Sun Dec 02 14:39:15 2007 +0000 @@ -48,7 +48,7 @@ "" }; -LIBVO_EXTERN(dfbmga) +const LIBVO_EXTERN(dfbmga) /****************************** * directfb * diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_dga.c --- a/libvo/vo_dga.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_dga.c Sun Dec 02 14:39:15 2007 +0000 @@ -45,7 +45,7 @@ "" }; -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) diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_directfb2.c --- a/libvo/vo_directfb2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_directfb2.c Sun Dec 02 14:39:15 2007 +0000 @@ -65,7 +65,7 @@ "v 2.0 (for DirectFB version >=0.9.13)" }; -LIBVO_EXTERN(directfb) +const LIBVO_EXTERN(directfb) /****************************** * vo_directfb globals * diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_directx.c --- a/libvo/vo_directx.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_directx.c Sun Dec 02 14:39:15 2007 +0000 @@ -143,7 +143,7 @@ "" }; -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) diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_dxr2.c --- a/libvo/vo_dxr2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_dxr2.c Sun Dec 02 14:39:15 2007 +0000 @@ -139,7 +139,7 @@ "" }; -LIBVO_EXTERN (dxr2) +const LIBVO_EXTERN (dxr2) static char *ucodesearchpath[] = { "/usr/local/lib/dxr2/dvd12.ux", diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_dxr3.c --- a/libvo/vo_dxr3.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_dxr3.c Sun Dec 02 14:39:15 2007 +0000 @@ -159,7 +159,7 @@ "David Holm ", "" }; -LIBVO_EXTERN (dxr3) +const LIBVO_EXTERN (dxr3) /* Resolutions and positions */ static int v_width, v_height; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_fbdev2.c --- a/libvo/vo_fbdev2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_fbdev2.c Sun Dec 02 14:39:15 2007 +0000 @@ -29,7 +29,7 @@ "" }; -LIBVO_EXTERN(fbdev2) +const LIBVO_EXTERN(fbdev2) static void set_bpp(struct fb_var_screeninfo *p, int bpp) { diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_ggi.c --- a/libvo/vo_ggi.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_ggi.c Sun Dec 02 14:39:15 2007 +0000 @@ -44,7 +44,7 @@ "major" }; -LIBVO_EXTERN(ggi) +const LIBVO_EXTERN(ggi) static struct ggi_conf_s { diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_gif89a.c --- a/libvo/vo_gif89a.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_gif89a.c Sun Dec 02 14:39:15 2007 +0000 @@ -68,7 +68,7 @@ "" }; -LIBVO_EXTERN(gif89a) +const LIBVO_EXTERN(gif89a) // how many frames per second we are aiming for during output. diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_gl.c --- a/libvo/vo_gl.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_gl.c Sun Dec 02 14:39:15 2007 +0000 @@ -27,7 +27,7 @@ "" }; -LIBVO_EXTERN(gl) +const LIBVO_EXTERN(gl) #ifdef GL_WIN32 static int gl_vinfo = 0; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_gl2.c --- a/libvo/vo_gl2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_gl2.c Sun Dec 02 14:39:15 2007 +0000 @@ -41,7 +41,7 @@ "" }; -LIBVO_EXTERN(gl2) +const LIBVO_EXTERN(gl2) /* local data */ static unsigned char *ImageData=NULL; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_ivtv.c --- a/libvo/vo_ivtv.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_ivtv.c Sun Dec 02 14:39:15 2007 +0000 @@ -69,7 +69,7 @@ "Benjamin Zores", "" }; -LIBVO_EXTERN (ivtv) +const LIBVO_EXTERN (ivtv) /* ivtv internals */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_jpeg.c --- a/libvo/vo_jpeg.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_jpeg.c Sun Dec 02 14:39:15 2007 +0000 @@ -67,7 +67,7 @@ "" }; -LIBVO_EXTERN (jpeg) +const LIBVO_EXTERN (jpeg) /* ------------------------------------------------------------------------- */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_md5sum.c --- a/libvo/vo_md5sum.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_md5sum.c Sun Dec 02 14:39:15 2007 +0000 @@ -66,7 +66,7 @@ "" }; -LIBVO_EXTERN (md5sum) +const LIBVO_EXTERN (md5sum) /* ------------------------------------------------------------------------- */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_mga.c --- a/libvo/vo_mga.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_mga.c Sun Dec 02 14:39:15 2007 +0000 @@ -30,7 +30,7 @@ "Based on some code by Aaron Holtzman " }; -LIBVO_EXTERN(mga) +const LIBVO_EXTERN(mga) #include "mga_common.c" diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_mpegpes.c --- a/libvo/vo_mpegpes.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_mpegpes.c Sun Dec 02 14:39:15 2007 +0000 @@ -76,7 +76,7 @@ "" }; -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) diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_null.c --- a/libvo/vo_null.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_null.c Sun Dec 02 14:39:15 2007 +0000 @@ -38,7 +38,7 @@ "" }; -LIBVO_EXTERN(null) +const LIBVO_EXTERN(null) static uint32_t image_width, image_height; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_png.c --- a/libvo/vo_png.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_png.c Sun Dec 02 14:39:15 2007 +0000 @@ -30,7 +30,7 @@ "" }; -LIBVO_EXTERN (png) +const LIBVO_EXTERN (png) static int z_compression = Z_NO_COMPRESSION; static int framenum = 0; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_pnm.c --- a/libvo/vo_pnm.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_pnm.c Sun Dec 02 14:39:15 2007 +0000 @@ -73,7 +73,7 @@ "" }; -LIBVO_EXTERN (pnm) +const LIBVO_EXTERN (pnm) /* ------------------------------------------------------------------------- */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_quartz.c --- a/libvo/vo_quartz.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_quartz.c Sun Dec 02 14:39:15 2007 +0000 @@ -46,7 +46,7 @@ "" }; -LIBVO_EXTERN(quartz) +const LIBVO_EXTERN(quartz) static uint32_t image_depth; static uint32_t image_format; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_s3fb.c --- a/libvo/vo_s3fb.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_s3fb.c Sun Dec 02 14:39:15 2007 +0000 @@ -37,7 +37,7 @@ "" }; -LIBVO_EXTERN(s3fb) +const LIBVO_EXTERN(s3fb) typedef struct vga_type { int cr38, cr39, cr53; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_sdl.c --- a/libvo/vo_sdl.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_sdl.c Sun Dec 02 14:39:15 2007 +0000 @@ -134,7 +134,7 @@ "" }; -LIBVO_EXTERN(sdl) +const LIBVO_EXTERN(sdl) #include //#include diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_tdfx_vid.c --- a/libvo/vo_tdfx_vid.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_tdfx_vid.c Sun Dec 02 14:39:15 2007 +0000 @@ -51,7 +51,7 @@ //#define VERBOSE -LIBVO_EXTERN(tdfx_vid) +const LIBVO_EXTERN(tdfx_vid) static tdfx_vid_config_t tdfx_cfg; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_tdfxfb.c --- a/libvo/vo_tdfxfb.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_tdfxfb.c Sun Dec 02 14:39:15 2007 +0000 @@ -55,7 +55,7 @@ "" }; -LIBVO_EXTERN(tdfxfb) +const LIBVO_EXTERN(tdfxfb) /* Some registers on the card */ #define S2S_STRECH_BLT 2 // BLT + Strech diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_tga.c --- a/libvo/vo_tga.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_tga.c Sun Dec 02 14:39:15 2007 +0000 @@ -46,7 +46,7 @@ }; -LIBVO_EXTERN (tga) +const LIBVO_EXTERN (tga) /* locals vars */ static int frame_num = 0; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_v4l2.c --- a/libvo/vo_v4l2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_v4l2.c Sun Dec 02 14:39:15 2007 +0000 @@ -63,7 +63,7 @@ "Benjamin Zores", "" }; -LIBVO_EXTERN (v4l2) +const LIBVO_EXTERN (v4l2) int v4l2_write (unsigned char *data, int len) diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_x11.c --- a/libvo/vo_x11.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_x11.c Sun Dec 02 14:39:15 2007 +0000 @@ -57,7 +57,7 @@ "" }; -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, diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_xmga.c --- a/libvo/vo_xmga.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_xmga.c Sun Dec 02 14:39:15 2007 +0000 @@ -54,7 +54,7 @@ "" }; -LIBVO_EXTERN(xmga) +const LIBVO_EXTERN(xmga) static XGCValues wGCV; static uint32_t mDepth; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_xv.c --- a/libvo/vo_xv.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_xv.c Sun Dec 02 14:39:15 2007 +0000 @@ -54,7 +54,7 @@ "" }; -LIBVO_EXTERN(xv) +const LIBVO_EXTERN(xv) #ifdef HAVE_SHM #include #include diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_xvmc.c --- a/libvo/vo_xvmc.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_xvmc.c Sun Dec 02 14:39:15 2007 +0000 @@ -126,7 +126,7 @@ "" }; -LIBVO_EXTERN(xvmc); +const LIBVO_EXTERN(xvmc); //shm stuff from vo_xv #ifdef HAVE_SHM diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_xvr100.c --- a/libvo/vo_xvr100.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_xvr100.c Sun Dec 02 14:39:15 2007 +0000 @@ -59,7 +59,7 @@ "" }; -LIBVO_EXTERN(xvr100) +const LIBVO_EXTERN(xvr100) #define PFB_VRAM_MMAPBASE 0x08000000 #define PFB_VRAM_MMAPLEN 0x04000000 /* depends on memory size */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_yuv4mpeg.c --- a/libvo/vo_yuv4mpeg.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_yuv4mpeg.c Sun Dec 02 14:39:15 2007 +0000 @@ -53,7 +53,7 @@ "" }; -LIBVO_EXTERN (yuv4mpeg) +const LIBVO_EXTERN (yuv4mpeg) static int image_width = 0; static int image_height = 0; diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_zr.c --- a/libvo/vo_zr.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_zr.c Sun Dec 02 14:39:15 2007 +0000 @@ -38,7 +38,7 @@ "" }; -LIBVO_EXTERN (zr) +const LIBVO_EXTERN (zr) #define ZR_MAX_DEVICES 4 /* General variables */ diff -r e82ecde2cbd4 -r c9e9ac2008c2 libvo/vo_zr2.c --- a/libvo/vo_zr2.c Sun Dec 02 14:24:23 2007 +0000 +++ b/libvo/vo_zr2.c Sun Dec 02 14:39:15 2007 +0000 @@ -36,7 +36,7 @@ "" }; -LIBVO_EXTERN(zr2) +const LIBVO_EXTERN(zr2) typedef struct { /* options */