summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-15 10:03:09 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-15 10:03:09 +0000
commit8484309af23652bbb4155ad3f840aeb10a4def8d (patch)
tree9a606710520dbae951f5d5e57b94c97fd3667d82
parent17d0933e5710a96c9a182f764e353a930721f104 (diff)
downloadmpv-8484309af23652bbb4155ad3f840aeb10a4def8d.tar.bz2
mpv-8484309af23652bbb4155ad3f840aeb10a4def8d.tar.xz
Remove obsolete extra elements from opt_t struct initialization.
Fixes a bunch of 'excess elements in struct initializer' warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28957 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_aa.c6
-rw-r--r--libvo/vo_gif89a.c6
-rw-r--r--libvo/vo_jpeg.c20
-rw-r--r--libvo/vo_md5sum.c4
-rw-r--r--libvo/vo_png.c4
-rw-r--r--libvo/vo_pnm.c18
-rw-r--r--libvo/vo_sdl.c8
-rw-r--r--libvo/vo_zr2.c8
8 files changed, 37 insertions, 37 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index d4b596b40a..514ad25898 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -579,9 +579,9 @@ static int parse_suboptions(const char *arg) {
*helpmsg = NULL;
int pseudoargc, displayhelp = 0, *booleans;
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} };
+ {"osdcolor", OPT_ARG_MSTRZ, &osdcolor, NULL},
+ {"subcolor", OPT_ARG_MSTRZ, &subcolor, NULL},
+ {"help", OPT_ARG_BOOL, &displayhelp, NULL} };
opt_t *subopts = NULL, *p;
char * const strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font",
"-width", "-height", "-minwidth", "-minheight", "-maxwidth",
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index 3ad230a20b..b480b75656 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -105,9 +105,9 @@ static char *gif_filename = NULL;
#define DEFAULT_FILE "out.gif"
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}
+ {"output", OPT_ARG_MSTRZ, &gif_filename, NULL},
+ {"fps", OPT_ARG_FLOAT, &target_fps, NULL},
+ {NULL, 0, NULL, NULL}
};
static int preinit(const char *arg)
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index bcd86c6eec..4ba5178272 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -340,19 +340,19 @@ static int int_zero_hundred(int *val)
static int preinit(const char *arg)
{
const opt_t subopts[] = {
- {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL, 0},
- {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL, 0},
+ {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL},
+ {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL},
{"optimize", OPT_ARG_INT, &jpeg_optimize,
- (opt_test_f)int_zero_hundred, 0},
+ (opt_test_f)int_zero_hundred},
{"smooth", OPT_ARG_INT, &jpeg_smooth,
- (opt_test_f)int_zero_hundred, 0},
+ (opt_test_f)int_zero_hundred},
{"quality", OPT_ARG_INT, &jpeg_quality,
- (opt_test_f)int_zero_hundred, 0},
- {"dpi", OPT_ARG_INT, &jpeg_dpi, NULL, 0},
- {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL, 0},
- {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL, 0},
- {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos, 0},
- {NULL, 0, NULL, NULL, 0}
+ (opt_test_f)int_zero_hundred},
+ {"dpi", OPT_ARG_INT, &jpeg_dpi, NULL},
+ {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL},
+ {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL},
+ {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos},
+ {NULL, 0, NULL, NULL}
};
const char *info_message = NULL;
diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c
index 08dc49d548..bf506f430b 100644
--- a/libvo/vo_md5sum.c
+++ b/libvo/vo_md5sum.c
@@ -108,8 +108,8 @@ static void md5sum_write_error(void) {
static int preinit(const char *arg)
{
const opt_t subopts[] = {
- {"outfile", OPT_ARG_MSTRZ, &md5sum_outfile, NULL, 0},
- {NULL, 0, NULL, NULL, 0}
+ {"outfile", OPT_ARG_MSTRZ, &md5sum_outfile, NULL},
+ {NULL, 0, NULL, NULL}
};
mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
diff --git a/libvo/vo_png.c b/libvo/vo_png.c
index b2e75897ea..9f0dbed1fe 100644
--- a/libvo/vo_png.c
+++ b/libvo/vo_png.c
@@ -291,9 +291,9 @@ static int int_zero_to_nine(int *sh)
}
static const opt_t subopts[] = {
- {"alpha", OPT_ARG_BOOL, &use_alpha, NULL, 0},
+ {"alpha", OPT_ARG_BOOL, &use_alpha, NULL},
{"z", OPT_ARG_INT, &z_compression, (opt_test_f)int_zero_to_nine},
- {"outdir", OPT_ARG_MSTRZ, &png_outdir, NULL, 0},
+ {"outdir", OPT_ARG_MSTRZ, &png_outdir, NULL},
{NULL}
};
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c
index 6525a2141d..9fab71fc7b 100644
--- a/libvo/vo_pnm.c
+++ b/libvo/vo_pnm.c
@@ -121,15 +121,15 @@ static int preinit(const char *arg)
int ppm_type = 0, pgm_type = 0, pgmyuv_type = 0,
raw_mode = 0, ascii_mode = 0;
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},
- {"raw", OPT_ARG_BOOL, &raw_mode, NULL, 0},
- {"ascii", OPT_ARG_BOOL, &ascii_mode, NULL, 0},
- {"outdir", OPT_ARG_MSTRZ, &pnm_outdir, NULL, 0},
- {"subdirs", OPT_ARG_MSTRZ, &pnm_subdirs, NULL, 0},
- {"maxfiles", OPT_ARG_INT, &pnm_maxfiles, (opt_test_f)int_pos, 0},
- {NULL, 0, NULL, NULL, 0}
+ {"ppm", OPT_ARG_BOOL, &ppm_type, NULL},
+ {"pgm", OPT_ARG_BOOL, &pgm_type, NULL},
+ {"pgmyuv", OPT_ARG_BOOL, &pgmyuv_type, NULL},
+ {"raw", OPT_ARG_BOOL, &raw_mode, NULL},
+ {"ascii", OPT_ARG_BOOL, &ascii_mode, NULL},
+ {"outdir", OPT_ARG_MSTRZ, &pnm_outdir, NULL},
+ {"subdirs", OPT_ARG_MSTRZ, &pnm_subdirs, NULL},
+ {"maxfiles", OPT_ARG_INT, &pnm_maxfiles, (opt_test_f)int_pos},
+ {NULL, 0, NULL, NULL}
};
const char *info_message = NULL;
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 8ec6d4fbc3..a62a7a2519 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -1527,10 +1527,10 @@ static int preinit(const char *arg)
int sdl_hwaccel;
int sdl_forcexv;
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},
- {NULL, 0, NULL, NULL, 0}
+ {"forcexv", OPT_ARG_BOOL, &sdl_forcexv, NULL},
+ {"hwaccel", OPT_ARG_BOOL, &sdl_hwaccel, NULL},
+ {"driver", OPT_ARG_MSTRZ, &sdl_driver, NULL},
+ {NULL, 0, NULL, NULL}
};
sdl_forcexv = 1;
diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c
index 34a92c4172..262127e1da 100644
--- a/libvo/vo_zr2.c
+++ b/libvo/vo_zr2.c
@@ -210,10 +210,10 @@ static int preinit(const char *arg) {
char *dev_arg = NULL, *norm_arg = NULL;
int norm = VIDEO_MODE_AUTO, prebuf = 0;
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 },
- { NULL, 0, NULL, NULL, 0 }
+ { "dev", OPT_ARG_MSTRZ, &dev_arg, NULL },
+ { "prebuf", OPT_ARG_BOOL, &prebuf, (opt_test_f)pbc },
+ { "norm", OPT_ARG_MSTRZ, &norm_arg, (opt_test_f)nc },
+ { NULL, 0, NULL, NULL }
};
VERBOSE("preinit() called with arg: %s\n", arg);