# HG changeset patch
# User reimar
# Date 1236415900 0
# Node ID 56eee6ffba9bde11aec3cdf79c05a187c1a35c3b
# Parent  2b021e3e1000c59262817e88e93be43e5f21f0c5
Make data related to suboption parsing const in libvo

diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_aa.c
--- a/libvo/vo_aa.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_aa.c	Sat Mar 07 08:51:40 2009 +0000
@@ -578,19 +578,19 @@
     char *pseudoargv[4], *osdcolor = NULL, *subcolor = NULL, **strings,
          *helpmsg = NULL;
     int pseudoargc, displayhelp = 0, *booleans;
-    opt_t extra_opts[] = {
+    const opt_t extra_opts[] = {
             {"osdcolor", OPT_ARG_MSTRZ, &osdcolor,    NULL, 0},
             {"subcolor", OPT_ARG_MSTRZ, &subcolor,    NULL, 0},
             {"help",     OPT_ARG_BOOL,  &displayhelp, NULL, 0} };
     opt_t *subopts = NULL, *p;
-    char *strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font",
+    char * const strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font",
         "-width", "-height", "-minwidth", "-minheight", "-maxwidth",
         "-maxheight", "-recwidth", "-recheight", "-bright",  "-contrast",
         "-gamma",  "-dimmul", "-boldmul", "-random" };
-    char *booleans_list[] = {"-dim", "-bold", "-reverse", "-normal",
+    char * const booleans_list[] = {"-dim", "-bold", "-reverse", "-normal",
         "-boldfont", "-inverse", "-extended", "-eight", "-dither",
         "-floyd_steinberg", "-error_distribution"};
-    char *nobooleans_list[] = {"-nodim", "-nobold", "-noreverse", "-nonormal",
+    char * const nobooleans_list[] = {"-nodim", "-nobold", "-noreverse", "-nonormal",
         "-noboldfont", "-noinverse", "-noextended", "-noeight", "-nodither",
         "-nofloyd_steinberg", "-noerror_distribution"};
     const int nstrings = sizeof(strings_list) / sizeof(char*);
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_directfb2.c
--- a/libvo/vo_directfb2.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_directfb2.c	Sat Mar 07 08:51:40 2009 +0000
@@ -175,7 +175,7 @@
     strarg_t mode_str = {0, NULL};
     strarg_t par_str = {0, NULL};
     strarg_t dfb_params = {0, NULL};
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
       {"input",       OPT_ARG_BOOL, &use_input,  NULL},
       {"buffermode",  OPT_ARG_STR,  &mode_str,   check_mode},
       {"fieldparity", OPT_ARG_STR,  &par_str,    check_parity},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_gif89a.c
--- a/libvo/vo_gif89a.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_gif89a.c	Sat Mar 07 08:51:40 2009 +0000
@@ -104,7 +104,7 @@
 // the default output filename
 #define DEFAULT_FILE "out.gif"
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
   {"output",       OPT_ARG_MSTRZ, &gif_filename, NULL, 0},
   {"fps",          OPT_ARG_FLOAT, &target_fps,   NULL, 0},
   {NULL, 0, NULL, NULL, 0}
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_gl.c
--- a/libvo/vo_gl.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_gl.c	Sat Mar 07 08:51:40 2009 +0000
@@ -973,7 +973,7 @@
   vo_uninit();
 }
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
   {"manyfmts",     OPT_ARG_BOOL, &many_fmts,    NULL},
   {"osd",          OPT_ARG_BOOL, &use_osd,      NULL},
   {"scaled-osd",   OPT_ARG_BOOL, &scaled_osd,   NULL},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_gl2.c
--- a/libvo/vo_gl2.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_gl2.c	Sat Mar 07 08:51:40 2009 +0000
@@ -844,7 +844,7 @@
   vo_uninit();
 }
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
   {"yuv",          OPT_ARG_INT,  &use_yuv,      (opt_test_f)int_non_neg},
   {"glfinish",     OPT_ARG_BOOL, &use_glFinish, NULL},
   {NULL}
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_ivtv.c
--- a/libvo/vo_ivtv.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_ivtv.c	Sat Mar 07 08:51:40 2009 +0000
@@ -59,7 +59,7 @@
 static int output = -1;
 static char *device = NULL;
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
   {"output",   OPT_ARG_INT,       &output,       (opt_test_f)int_non_neg},
   {"device",   OPT_ARG_MSTRZ,     &device,       NULL},
   {NULL}
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_jpeg.c
--- a/libvo/vo_jpeg.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_jpeg.c	Sat Mar 07 08:51:40 2009 +0000
@@ -339,7 +339,7 @@
 
 static int preinit(const char *arg)
 {
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
         {"progressive", OPT_ARG_BOOL,   &jpeg_progressive_mode, NULL, 0},
         {"baseline",    OPT_ARG_BOOL,   &jpeg_baseline,         NULL, 0},
         {"optimize",    OPT_ARG_INT,    &jpeg_optimize,
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_md5sum.c
--- a/libvo/vo_md5sum.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_md5sum.c	Sat Mar 07 08:51:40 2009 +0000
@@ -107,7 +107,7 @@
 
 static int preinit(const char *arg)
 {
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
         {"outfile",     OPT_ARG_MSTRZ,    &md5sum_outfile,   NULL, 0},
         {NULL, 0, NULL, NULL, 0}
     };
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_png.c
--- a/libvo/vo_png.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_png.c	Sat Mar 07 08:51:40 2009 +0000
@@ -290,7 +290,7 @@
     return 1;
 }
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
     {"alpha", OPT_ARG_BOOL, &use_alpha, NULL, 0},
     {"z",   OPT_ARG_INT, &z_compression, (opt_test_f)int_zero_to_nine},
     {"outdir",      OPT_ARG_MSTRZ,  &png_outdir,           NULL, 0},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_pnm.c
--- a/libvo/vo_pnm.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_pnm.c	Sat Mar 07 08:51:40 2009 +0000
@@ -120,7 +120,7 @@
 {
     int ppm_type = 0, pgm_type = 0, pgmyuv_type = 0,
         raw_mode = 0, ascii_mode = 0;
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
         {"ppm",         OPT_ARG_BOOL,   &ppm_type,      NULL, 0},
         {"pgm",         OPT_ARG_BOOL,   &pgm_type,      NULL, 0},
         {"pgmyuv",      OPT_ARG_BOOL,   &pgmyuv_type,   NULL, 0},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_sdl.c	Sat Mar 07 08:51:40 2009 +0000
@@ -1526,7 +1526,7 @@
     char * sdl_driver = NULL;
     int sdl_hwaccel;
     int sdl_forcexv;
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
 	    {"forcexv", OPT_ARG_BOOL,  &sdl_forcexv, NULL, 0},
 	    {"hwaccel", OPT_ARG_BOOL,  &sdl_hwaccel, NULL, 0},
 	    {"driver",  OPT_ARG_MSTRZ, &sdl_driver,  NULL, 0},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_v4l2.c
--- a/libvo/vo_v4l2.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_v4l2.c	Sat Mar 07 08:51:40 2009 +0000
@@ -53,7 +53,7 @@
 static int output = -1;
 static char *device = NULL;
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
   {"output",   OPT_ARG_INT,       &output,       (opt_test_f)int_non_neg},
   {"device",   OPT_ARG_MSTRZ,     &device,       NULL},
   {NULL}
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_vdpau.c
--- a/libvo/vo_vdpau.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_vdpau.c	Sat Mar 07 08:51:40 2009 +0000
@@ -949,7 +949,7 @@
     dlclose(vdpau_lib_handle);
 }
 
-static opt_t subopts[] = {
+static const opt_t subopts[] = {
     {"deint",   OPT_ARG_INT,   &deint,   (opt_test_f)int_non_neg},
     {"pullup",  OPT_ARG_BOOL,  &pullup,  NULL},
     {"denoise", OPT_ARG_FLOAT, &denoise, NULL},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_xv.c
--- a/libvo/vo_xv.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_xv.c	Sat Mar 07 08:51:40 2009 +0000
@@ -611,7 +611,7 @@
     strarg_t ck_method_arg = { 0, NULL };
     int xv_adaptor = -1;
 
-    opt_t subopts[] =
+    const opt_t subopts[] =
     {  
       /* name         arg type     arg var         test */
       {  "port",      OPT_ARG_INT, &xv_port,       (opt_test_f)int_pos },
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_xvmc.c
--- a/libvo/vo_xvmc.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_xvmc.c	Sat Mar 07 08:51:40 2009 +0000
@@ -379,7 +379,7 @@
     int mc_ver,mc_rev;
     strarg_t ck_src_arg = { 0, NULL };
     strarg_t ck_method_arg = { 0, NULL };
-    opt_t subopts [] =
+    const opt_t subopts [] =
     {
         /* name         arg type      arg var           test */
         {  "port",      OPT_ARG_INT,  &xv_port_request, (opt_test_f)int_pos },
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_yuv4mpeg.c
--- a/libvo/vo_yuv4mpeg.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_yuv4mpeg.c	Sat Mar 07 08:51:40 2009 +0000
@@ -513,7 +513,7 @@
 static int preinit(const char *arg)
 {
   int il, il_bf;
-  opt_t subopts[] = {
+  const opt_t subopts[] = {
     {"interlaced",    OPT_ARG_BOOL, &il,    NULL},
     {"interlaced_bf", OPT_ARG_BOOL, &il_bf, NULL},
     {"file",          OPT_ARG_MSTRZ,  &yuv_filename,  NULL},
diff -r 2b021e3e1000 -r 56eee6ffba9b libvo/vo_zr2.c
--- a/libvo/vo_zr2.c	Fri Mar 06 20:41:02 2009 +0000
+++ b/libvo/vo_zr2.c	Sat Mar 07 08:51:40 2009 +0000
@@ -209,7 +209,7 @@
 	const char *dev = NULL;
 	char *dev_arg = NULL, *norm_arg = NULL;
 	int norm = VIDEO_MODE_AUTO, prebuf = 0;
-	opt_t subopts[] = { /* don't want warnings with -Wall... */
+	const opt_t subopts[] = { /* don't want warnings with -Wall... */
 		{ "dev",    OPT_ARG_MSTRZ, &dev_arg,   NULL, 	        0 },
 		{ "prebuf", OPT_ARG_BOOL,  &prebuf,    (opt_test_f)pbc, 0 },
 		{ "norm",   OPT_ARG_MSTRZ, &norm_arg,  (opt_test_f)nc,  0 },