diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-24 18:14:42 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-28 18:23:05 +0200 |
| commit | eb8bc57240d5d3e4680ff1df18a0a7792e96bd0c (patch) | |
| tree | b3dc566505456d6a121bc0e3f03883e52bd7ac7a /cmdutils.h | |
| parent | 78046dadc3145a7afd16034ab1178033a053a03e (diff) | |
| download | ffmpeg-eb8bc57240d5d3e4680ff1df18a0a7792e96bd0c.tar.gz | |
cmdutils: remove OPT_FUNC2
Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmdutils.h b/cmdutils.h index 9e5827fc2b..eea44018b6 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -121,17 +121,15 @@ typedef struct { #define OPT_INT 0x0080 #define OPT_FLOAT 0x0100 #define OPT_SUBTITLE 0x0200 -#define OPT_FUNC2 0x0400 -#define OPT_INT64 0x0800 -#define OPT_EXIT 0x1000 -#define OPT_DATA 0x2000 -#define OPT_DUMMY 0x4000 +#define OPT_INT64 0x0400 +#define OPT_EXIT 0x0800 +#define OPT_DATA 0x1000 +#define OPT_DUMMY 0x2000 union { - void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func int *int_arg; char **str_arg; float *float_arg; - int (*func2_arg)(const char *, const char *); + int (*func_arg)(const char *, const char *); int64_t *int64_arg; } u; const char *help; |