From 909887bdbe206b88ba19b5effd18a4fe3235ecdf Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 2 Dec 2007 14:06:03 +0000 Subject: Make vo info structs const git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.h | 2 +- libvo/vo_3dfx.c | 2 +- libvo/vo_aa.c | 2 +- libvo/vo_bl.c | 2 +- libvo/vo_caca.c | 2 +- libvo/vo_cvidix.c | 2 +- libvo/vo_dfbmga.c | 2 +- libvo/vo_dga.c | 2 +- libvo/vo_directfb2.c | 2 +- libvo/vo_directx.c | 2 +- libvo/vo_dxr2.c | 2 +- libvo/vo_dxr3.c | 2 +- libvo/vo_fbdev.c | 2 +- libvo/vo_fbdev2.c | 2 +- libvo/vo_ggi.c | 2 +- libvo/vo_gif89a.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_jpeg.c | 2 +- libvo/vo_md5sum.c | 2 +- libvo/vo_mga.c | 2 +- libvo/vo_mpegpes.c | 2 +- libvo/vo_null.c | 2 +- libvo/vo_png.c | 2 +- libvo/vo_pnm.c | 2 +- libvo/vo_quartz.c | 2 +- libvo/vo_s3fb.c | 2 +- libvo/vo_sdl.c | 2 +- libvo/vo_svga.c | 2 +- libvo/vo_tdfx_vid.c | 2 +- libvo/vo_tdfxfb.c | 2 +- libvo/vo_tga.c | 2 +- libvo/vo_v4l2.c | 2 +- libvo/vo_vesa.c | 2 +- libvo/vo_winvidix.c | 2 +- libvo/vo_x11.c | 2 +- libvo/vo_xmga.c | 2 +- libvo/vo_xover.c | 2 +- libvo/vo_xv.c | 2 +- libvo/vo_xvidix.c | 2 +- libvo/vo_xvmc.c | 2 +- libvo/vo_xvr100.c | 2 +- libvo/vo_yuv4mpeg.c | 2 +- libvo/vo_zr.c | 2 +- libvo/vo_zr2.c | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) (limited to 'libvo') diff --git a/libvo/video_out.h b/libvo/video_out.h index e9f9dc8920..ee31c8735b 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -110,7 +110,7 @@ typedef struct vo_info_s typedef struct vo_functions_s { - vo_info_t *info; + const vo_info_t *info; /* * Preinitializes driver (real INITIALIZATION) * arg - currently it's vo_subdevice diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c index 628722dc39..5328c14c2d 100644 --- a/libvo/vo_3dfx.c +++ b/libvo/vo_3dfx.c @@ -51,7 +51,7 @@ #include "fastmemcpy.h" -static vo_info_t info = +static const vo_info_t info = { "3dfx (/dev/3dfx)", "3dfx", diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index e71b82c8b5..75e09da56c 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -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 and Folke Ashberg ", diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index 19f85a8c76..91d70f3d4d 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -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", diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index d5dc3e7ffb..eefcf674ed 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -38,7 +38,7 @@ #include #endif -static vo_info_t info = { +static const vo_info_t info = { "libcaca", "caca", "Pigeon ", diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index 1caaff6800..7dd74ee07b 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -26,7 +26,7 @@ #include "vidix/vidixlib.h" -static vo_info_t info = { +static const vo_info_t info = { "console VIDIX", "cvidix", "Sascha Sommer", diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index d4e36a80e0..29a84fc225 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -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 ", diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 5fcea7b94a..4f8b47a361 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -30,7 +30,7 @@ #include #endif -static vo_info_t info = { +static const vo_info_t info = { #ifdef HAVE_DGA2 "DGA ( Direct Graphic Access V2.0 )", #else diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index dddd6acd54..24e6000769 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -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", diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index dac261480c..99602562a9 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -135,7 +135,7 @@ static directx_fourcc_caps g_ddpf[] = }; #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", diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index 913400c2b6..f2c9509b47 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -132,7 +132,7 @@ m_option_t dxr2_opts[] = { { NULL,NULL, 0, 0, 0, 0, NULL} }; -static vo_info_t info = { +static const vo_info_t info = { "DXR2 video out", "dxr2", "Alban Bedel and Tobias Diedrich ", diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index b66a004433..a08fc7ffa2 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -152,7 +152,7 @@ #define SPU_SUPPORT -static vo_info_t info = +static const vo_info_t info = { "DXR3/H+ video out", "dxr3", diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index 52671058fd..82e6344e41 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -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 ", diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c index f303832e59..4b75ea6d35 100644 --- a/libvo/vo_fbdev2.c +++ b/libvo/vo_fbdev2.c @@ -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 ", diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index 0fe3497472..0156955422 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -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", diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index 5937388e0e..8f50b4f141 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -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", diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 9b8e55fdd5..e1bf68de71 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -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", diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 173e999e21..dcb04350b3 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -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", diff --git a/libvo/vo_ivtv.c b/libvo/vo_ivtv.c index b3706717f1..81194fc320 100644 --- a/libvo/vo_ivtv.c +++ b/libvo/vo_ivtv.c @@ -62,7 +62,7 @@ static opt_t subopts[] = { {NULL} }; -static vo_info_t info = +static const vo_info_t info = { "IVTV MPEG Video Decoder TV-Out", "ivtv", diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index 36e89815ca..adea38f14a 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -59,7 +59,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "JPEG file", "jpeg", diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c index e9318b3b36..15f88ac816 100644 --- a/libvo/vo_md5sum.c +++ b/libvo/vo_md5sum.c @@ -58,7 +58,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "md5sum of each frame", "md5sum", diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c index dc7900d68c..0b4839b8f7 100644 --- a/libvo/vo_mga.c +++ b/libvo/vo_mga.c @@ -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", diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index 2e42f11ded..d823d47511 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -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", diff --git a/libvo/vo_null.c b/libvo/vo_null.c index 88259f23d1..e9f45b7326 100644 --- a/libvo/vo_null.c +++ b/libvo/vo_null.c @@ -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", diff --git a/libvo/vo_png.c b/libvo/vo_png.c index d93d59689b..0d32a2f944 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -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", diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c index 5c07dce700..4ec6da0bbe 100644 --- a/libvo/vo_pnm.c +++ b/libvo/vo_pnm.c @@ -65,7 +65,7 @@ /* Info */ -static vo_info_t info= +static const vo_info_t info= { "PPM/PGM/PGMYUV file", "pnm", diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 4ce31404a6..507fd61310 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -38,7 +38,7 @@ #include "vo_quartz.h" -static vo_info_t info = +static const vo_info_t info = { "Mac OSX (Quartz)", "quartz", diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c index b311871e89..e3be03463b 100644 --- a/libvo/vo_s3fb.c +++ b/libvo/vo_s3fb.c @@ -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", diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index edb4956404..b31449ee95 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -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", diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index 9837c6e027..d8f8e393b5 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -92,7 +92,7 @@ static struct { int locks; }PageStore[MAXPAGES]; -static vo_info_t info = { +static const vo_info_t info = { "SVGAlib", "svga", "Ivan Kalvachev ", diff --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c index f9bbfddaed..22240e9752 100644 --- a/libvo/vo_tdfx_vid.c +++ b/libvo/vo_tdfx_vid.c @@ -41,7 +41,7 @@ #include "drivers/tdfx_vid.h" -static vo_info_t info = +static const vo_info_t info = { "tdfx vid", "tdfx_vid", diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c index 39ae6549b4..5713202bb2 100644 --- a/libvo/vo_tdfxfb.c +++ b/libvo/vo_tdfxfb.c @@ -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", diff --git a/libvo/vo_tga.c b/libvo/vo_tga.c index 83c98d1972..9d4dd7a6f1 100644 --- a/libvo/vo_tga.c +++ b/libvo/vo_tga.c @@ -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", diff --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c index 65dd22ac35..a43aea7f7b 100644 --- a/libvo/vo_v4l2.c +++ b/libvo/vo_v4l2.c @@ -56,7 +56,7 @@ static opt_t subopts[] = { {NULL} }; -static vo_info_t info = +static const vo_info_t info = { "V4L2 MPEG Video Decoder Output", "v4l2", diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 491abc8302..3168ac08f7 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -67,7 +67,7 @@ extern char *monitor_dotclock_str; #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", diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index 0cf9a95cb6..e47169678a 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -28,7 +28,7 @@ #include "vidix/vidixlib.h" -static vo_info_t info = +static const vo_info_t info = { "WIN32 (VIDIX)", "winvidix", diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 72f2232f8e..2852c81705 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -50,7 +50,7 @@ int XShmGetEventBase(Display *); #include "mplayer.h" #endif -static vo_info_t info = { +static const vo_info_t info = { "X11 ( XImage/Shm )", "x11", "Aaron Holtzman ", diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index feb17e7e3d..96c3a76af4 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -47,7 +47,7 @@ static unsigned int timerd = 0; #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 ", diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 88689714d6..9c1275b542 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -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", diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index f90542be0d..e5e24eff7c 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -47,7 +47,7 @@ Buffer allocation: #include "libavutil/common.h" -static vo_info_t info = { +static const vo_info_t info = { "X11/Xv", "xv", "Gerd Knorr and others", diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 9f4c578e2c..7a455dd695 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -38,7 +38,7 @@ #endif -static vo_info_t info = { +static const vo_info_t info = { "X11 (VIDIX)", "xvidix", "Alex Beregszaszi", diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 51f941b7e5..d833f67130 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -119,7 +119,7 @@ static void xvmc_clean_surfaces(void); 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 ", diff --git a/libvo/vo_xvr100.c b/libvo/vo_xvr100.c index 2c27642127..af807c07a3 100644 --- a/libvo/vo_xvr100.c +++ b/libvo/vo_xvr100.c @@ -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", diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index c06cf28e8f..d61789ca2a 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -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", diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index fa7ae06be4..562941afa1 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -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", diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index e1413ac83d..173386d3a8 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -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 ", -- cgit v1.2.3