Mercurial > mplayer.hg
changeset 25216:3aee342be929
Make vo info structs const
line wrap: on
line diff
--- a/libvo/video_out.h Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/video_out.h Sun Dec 02 14:06:03 2007 +0000 @@ -110,7 +110,7 @@ typedef struct vo_functions_s { - vo_info_t *info; + const vo_info_t *info; /* * Preinitializes driver (real INITIALIZATION) * arg - currently it's vo_subdevice
--- a/libvo/vo_3dfx.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_3dfx.c Sun Dec 02 14:06:03 2007 +0000 @@ -51,7 +51,7 @@ #include "fastmemcpy.h" -static vo_info_t info = +static const vo_info_t info = { "3dfx (/dev/3dfx)", "3dfx",
--- a/libvo/vo_aa.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_aa.c Sun Dec 02 14:06:03 2007 +0000 @@ -44,7 +44,7 @@ #define MESSAGE_SIZE 512 #define MESSAGE_DEKO " +++ %s +++ " - static vo_info_t info = { + static const vo_info_t info = { "AAlib", "aa", "Alban Bedel <albeu@free.fr> and Folke Ashberg <folke@ashberg.de>",
--- a/libvo/vo_bl.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_bl.c Sun Dec 02 14:06:03 2007 +0000 @@ -47,7 +47,7 @@ #include "m_option.h" #include "fastmemcpy.h" -static vo_info_t info = +static const vo_info_t info = { "Blinkenlights driver: http://www.blinkenlights.de", "bl",
--- a/libvo/vo_caca.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_caca.c Sun Dec 02 14:06:03 2007 +0000 @@ -38,7 +38,7 @@ #include <caca0.h> #endif -static vo_info_t info = { +static const vo_info_t info = { "libcaca", "caca", "Pigeon <pigeon@pigeond.net>",
--- a/libvo/vo_cvidix.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_cvidix.c Sun Dec 02 14:06:03 2007 +0000 @@ -26,7 +26,7 @@ #include "vidix/vidixlib.h" -static vo_info_t info = { +static const vo_info_t info = { "console VIDIX", "cvidix", "Sascha Sommer",
--- a/libvo/vo_dfbmga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_dfbmga.c Sun Dec 02 14:06:03 2007 +0000 @@ -41,7 +41,7 @@ #include "aspect.h" #include "mp_fifo.h" -static vo_info_t info = { +static const vo_info_t info = { "DirectFB / Matrox G200/G400/G450/G550", "dfbmga", "Ville Syrjala <syrjala@sci.fi>",
--- a/libvo/vo_dga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_dga.c Sun Dec 02 14:06:03 2007 +0000 @@ -30,7 +30,7 @@ #include <X11/extensions/xf86vmode.h> #endif -static vo_info_t info = { +static const vo_info_t info = { #ifdef HAVE_DGA2 "DGA ( Direct Graphic Access V2.0 )", #else
--- a/libvo/vo_directfb2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_directfb2.c Sun Dec 02 14:06:03 2007 +0000 @@ -58,7 +58,7 @@ #define TRIPLE 1 #endif -static vo_info_t info = { +static const vo_info_t info = { "Direct Framebuffer Device", "directfb", "Jiri Svoboda Jiri.Svoboda@seznam.cz",
--- a/libvo/vo_directx.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_directx.c Sun Dec 02 14:06:03 2007 +0000 @@ -135,7 +135,7 @@ }; #define NUM_FORMATS (sizeof(g_ddpf) / sizeof(g_ddpf[0])) -static vo_info_t info = +static const vo_info_t info = { "Directx DDraw YUV/RGB/BGR renderer", "directx",
--- a/libvo/vo_dxr2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_dxr2.c Sun Dec 02 14:06:03 2007 +0000 @@ -132,7 +132,7 @@ { NULL,NULL, 0, 0, 0, 0, NULL} }; -static vo_info_t info = { +static const vo_info_t info = { "DXR2 video out", "dxr2", "Alban Bedel <albeu@free.fr> and Tobias Diedrich <ranma@gmx.at>",
--- a/libvo/vo_dxr3.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_dxr3.c Sun Dec 02 14:06:03 2007 +0000 @@ -152,7 +152,7 @@ #define SPU_SUPPORT -static vo_info_t info = +static const vo_info_t info = { "DXR3/H+ video out", "dxr3",
--- a/libvo/vo_fbdev.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_fbdev.c Sun Dec 02 14:06:03 2007 +0000 @@ -31,7 +31,7 @@ #include "aspect.h" #include "mp_msg.h" -static vo_info_t info = { +static const vo_info_t info = { "Framebuffer Device", "fbdev", "Szabolcs Berecz <szabi@inf.elte.hu>",
--- a/libvo/vo_fbdev2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_fbdev2.c Sun Dec 02 14:06:03 2007 +0000 @@ -22,7 +22,7 @@ #include "sub.h" #include "mp_msg.h" -static vo_info_t info = { +static const vo_info_t info = { "Framebuffer Device", "fbdev2", "Joey Parrish <joey@nicewarrior.org>",
--- a/libvo/vo_ggi.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_ggi.c Sun Dec 02 14:06:03 2007 +0000 @@ -36,7 +36,7 @@ /* maximum buffers */ #undef GGI_FLIP -static vo_info_t info = +static const vo_info_t info = { "General Graphics Interface (GGI) output", "ggi",
--- a/libvo/vo_gif89a.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_gif89a.c Sun Dec 02 14:06:03 2007 +0000 @@ -61,7 +61,7 @@ #define MPLAYER_VERSION 0.90 #define VO_GIF_REVISION 6 -static vo_info_t info = { +static const vo_info_t info = { "animated GIF output", "gif89a", "Joey Parrish joey@nicewarrior.org",
--- a/libvo/vo_gl.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_gl.c Sun Dec 02 14:06:03 2007 +0000 @@ -19,7 +19,7 @@ #include "libass/ass.h" #include "libass/ass_mp.h" -static vo_info_t info = +static const vo_info_t info = { "X11 (OpenGL)", "gl",
--- a/libvo/vo_gl2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_gl2.c Sun Dec 02 14:06:03 2007 +0000 @@ -33,7 +33,7 @@ #define TEXTURE_WIDTH 128 #undef TEXTURE_WIDTH -static vo_info_t info = +static const vo_info_t info = { "X11 (OpenGL) - multiple textures version", "gl2",
--- a/libvo/vo_ivtv.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_ivtv.c Sun Dec 02 14:06:03 2007 +0000 @@ -62,7 +62,7 @@ {NULL} }; -static vo_info_t info = +static const vo_info_t info = { "IVTV MPEG Video Decoder TV-Out", "ivtv",
--- a/libvo/vo_jpeg.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_jpeg.c Sun Dec 02 14:06:03 2007 +0000 @@ -59,7 +59,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "JPEG file", "jpeg",
--- a/libvo/vo_md5sum.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_md5sum.c Sun Dec 02 14:06:03 2007 +0000 @@ -58,7 +58,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "md5sum of each frame", "md5sum",
--- a/libvo/vo_mga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_mga.c Sun Dec 02 14:06:03 2007 +0000 @@ -22,7 +22,7 @@ #include "sub.h" #include "aspect.h" -static vo_info_t info = +static const vo_info_t info = { "Matrox G200/G4x0/G550 overlay (/dev/mga_vid)", "mga",
--- a/libvo/vo_mpegpes.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_mpegpes.c Sun Dec 02 14:06:03 2007 +0000 @@ -64,7 +64,7 @@ int vo_mpegpes_fd=-1; extern int vo_mpegpes_fd2; -static vo_info_t info = +static const vo_info_t info = { #ifdef HAVE_DVB "Mpeg-PES to DVB card",
--- a/libvo/vo_null.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_null.c Sun Dec 02 14:06:03 2007 +0000 @@ -30,7 +30,7 @@ #include "video_out.h" #include "video_out_internal.h" -static vo_info_t info = +static const vo_info_t info = { "Null video output", "null",
--- a/libvo/vo_png.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_png.c Sun Dec 02 14:06:03 2007 +0000 @@ -22,7 +22,7 @@ #include "video_out_internal.h" #include "subopt-helper.h" -static vo_info_t info = +static const vo_info_t info = { "PNG file", "png",
--- a/libvo/vo_pnm.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_pnm.c Sun Dec 02 14:06:03 2007 +0000 @@ -65,7 +65,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "PPM/PGM/PGMYUV file", "pnm",
--- a/libvo/vo_quartz.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_quartz.c Sun Dec 02 14:06:03 2007 +0000 @@ -38,7 +38,7 @@ #include "vo_quartz.h" -static vo_info_t info = +static const vo_info_t info = { "Mac OSX (Quartz)", "quartz",
--- a/libvo/vo_s3fb.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_s3fb.c Sun Dec 02 14:06:03 2007 +0000 @@ -29,7 +29,7 @@ #include "aspect.h" #include "sub.h" -static vo_info_t info = +static const vo_info_t info = { "S3 Virge over fbdev", "s3fb",
--- a/libvo/vo_sdl.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_sdl.c Sun Dec 02 14:06:03 2007 +0000 @@ -126,7 +126,7 @@ #include "subopt-helper.h" #include "mp_fifo.h" -static vo_info_t info = +static const vo_info_t info = { "SDL YUV/RGB/BGR renderer (SDL v1.1.7+ only!)", "sdl",
--- a/libvo/vo_svga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_svga.c Sun Dec 02 14:06:03 2007 +0000 @@ -92,7 +92,7 @@ int locks; }PageStore[MAXPAGES]; -static vo_info_t info = { +static const vo_info_t info = { "SVGAlib", "svga", "Ivan Kalvachev <iive@users.sf.net>",
--- a/libvo/vo_tdfx_vid.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_tdfx_vid.c Sun Dec 02 14:06:03 2007 +0000 @@ -41,7 +41,7 @@ #include "drivers/tdfx_vid.h" -static vo_info_t info = +static const vo_info_t info = { "tdfx vid", "tdfx_vid",
--- a/libvo/vo_tdfxfb.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_tdfxfb.c Sun Dec 02 14:06:03 2007 +0000 @@ -47,7 +47,7 @@ #include "aspect.h" #include "sub.h" -static vo_info_t info = +static const vo_info_t info = { "3Dfx Banshee/Voodoo3/Voodoo5", "tdfxfb",
--- a/libvo/vo_tga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_tga.c Sun Dec 02 14:06:03 2007 +0000 @@ -37,7 +37,7 @@ #include "video_out.h" #include "video_out_internal.h" -static vo_info_t info = +static const vo_info_t info = { "Targa output", "tga",
--- a/libvo/vo_v4l2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_v4l2.c Sun Dec 02 14:06:03 2007 +0000 @@ -56,7 +56,7 @@ {NULL} }; -static vo_info_t info = +static const vo_info_t info = { "V4L2 MPEG Video Decoder Output", "v4l2",
--- a/libvo/vo_vesa.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_vesa.c Sun Dec 02 14:06:03 2007 +0000 @@ -67,7 +67,7 @@ #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */ -static vo_info_t info = +static const vo_info_t info = { "VESA VBE 2.0 video output", "vesa",
--- a/libvo/vo_winvidix.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_winvidix.c Sun Dec 02 14:06:03 2007 +0000 @@ -28,7 +28,7 @@ #include "vidix/vidixlib.h" -static vo_info_t info = +static const vo_info_t info = { "WIN32 (VIDIX)", "winvidix",
--- a/libvo/vo_x11.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_x11.c Sun Dec 02 14:06:03 2007 +0000 @@ -50,7 +50,7 @@ #include "mplayer.h" #endif -static vo_info_t info = { +static const vo_info_t info = { "X11 ( XImage/Shm )", "x11", "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>",
--- a/libvo/vo_xmga.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xmga.c Sun Dec 02 14:06:03 2007 +0000 @@ -47,7 +47,7 @@ #include "gui/interface.h" #endif -static vo_info_t info = { +static const vo_info_t info = { "Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)", "xmga", "Zoltan Ponekker <pontscho@makacs.poliod.hu>",
--- a/libvo/vo_xover.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xover.c Sun Dec 02 14:06:03 2007 +0000 @@ -37,7 +37,7 @@ #endif -static vo_info_t info = +static const vo_info_t info = { "General X11 driver for overlay capable video output drivers", "xover",
--- a/libvo/vo_xv.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xv.c Sun Dec 02 14:06:03 2007 +0000 @@ -47,7 +47,7 @@ #include "libavutil/common.h" -static vo_info_t info = { +static const vo_info_t info = { "X11/Xv", "xv", "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
--- a/libvo/vo_xvidix.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xvidix.c Sun Dec 02 14:06:03 2007 +0000 @@ -38,7 +38,7 @@ #endif -static vo_info_t info = { +static const vo_info_t info = { "X11 (VIDIX)", "xvidix", "Alex Beregszaszi",
--- a/libvo/vo_xvmc.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xvmc.c Sun Dec 02 14:06:03 2007 +0000 @@ -119,7 +119,7 @@ static int count_free_surfaces(); static xvmc_render_state_t * find_free_surface(); -static vo_info_t info = { +static const vo_info_t info = { "XVideo Motion Compensation", "xvmc", "Ivan Kalvachev <iive@users.sf.net>",
--- a/libvo/vo_xvr100.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_xvr100.c Sun Dec 02 14:06:03 2007 +0000 @@ -52,7 +52,7 @@ #include "mp_msg.h" -static vo_info_t info = { +static const vo_info_t info = { "sun xvr-100", "xvr100", "Denes Balatoni",
--- a/libvo/vo_yuv4mpeg.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_yuv4mpeg.c Sun Dec 02 14:06:03 2007 +0000 @@ -45,7 +45,7 @@ #include "libmpcodecs/vf_scale.h" #include "libavutil/rational.h" -static vo_info_t info = +static const vo_info_t info = { "yuv4mpeg output for mjpegtools", "yuv4mpeg",
--- a/libvo/vo_zr.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_zr.c Sun Dec 02 14:06:03 2007 +0000 @@ -30,7 +30,7 @@ #include "jpeg_enc.h" -static vo_info_t info = +static const vo_info_t info = { "Zoran ZR360[56]7/ZR36060 Driver (DC10(+)/buz/lml33/MatroxRR)", "zr",
--- a/libvo/vo_zr2.c Sun Dec 02 13:53:03 2007 +0000 +++ b/libvo/vo_zr2.c Sun Dec 02 14:06:03 2007 +0000 @@ -29,7 +29,7 @@ #include "subopt-helper.h" #include "fastmemcpy.h" -static vo_info_t info = { +static const vo_info_t info = { "Zoran ZR360[56]7/ZR36060 Driver (DC10(+)/buz/lml33/MatroxRR)", "zr2", "Rik Snel <rsnel@cube.dyndns.org>",