diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-28 01:53:00 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-28 09:40:19 -0400 |
| commit | 26513856d657de3b3afacae7c13fd99a7fe79d05 (patch) | |
| tree | 89f497b6b71cd57d94e91d721772e575141325df /cmdutils.h | |
| parent | 009f829dde811af654af7110326aea3a72c05d5e (diff) | |
| download | ffmpeg-26513856d657de3b3afacae7c13fd99a7fe79d05.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.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmdutils.h b/cmdutils.h index 3bb1cd616b..e231b1ff84 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -121,16 +121,14 @@ 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_INT64 0x0400 +#define OPT_EXIT 0x0800 +#define OPT_DATA 0x1000 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; |