Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-10-31 15:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmdutils: remove OPT_FUNC2

Browse source 
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.
This commit is contained in:
Stefano Sabatini 2011-05-24 18:14:42 +02:00
parent 78046dadc3
commit eb8bc57240
6 changed files with 148 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmdutils.h
View file

@ -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;