diff options
| author | Michael Niedermayer | 2012-08-20 16:52:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-08-20 16:55:08 +0200 |
| commit | 67a6dac7c18caecb418f7590a484dcbfcad869ab (patch) | |
| tree | dfc518e76432ade673085eb8003c25edefb5fc53 /cmdutils.h | |
| parent | c5af0680848a62c482c0fd142f8d6646cec46212 (diff) | |
| parent | 7c5012127fb7e18f0616011257bb4248f6a8b608 (diff) | |
Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'
* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
cmdutils: change semantics of show_help_options() and document it.
avtools: move some newlines to show_help_options().
avconv: deprecate -isync.
Conflicts:
ffmpeg_opt.c
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmdutils.h b/cmdutils.h index f50eb173c0..fb2229fc50 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -148,7 +148,6 @@ typedef struct { #define OPT_STRING 0x0008 #define OPT_VIDEO 0x0010 #define OPT_AUDIO 0x0020 -#define OPT_GRAB 0x0040 #define OPT_INT 0x0080 #define OPT_FLOAT 0x0100 #define OPT_SUBTITLE 0x0200 @@ -172,8 +171,16 @@ typedef struct { const char *argname; } OptionDef; -void show_help_options(const OptionDef *options, const char *msg, int mask, - int value); +/** + * Print help for all options matching specified flags. + * + * @param options a list of options + * @param msg title of this group. Only printed if at least one option matches. + * @param req_flags print only options which have all those flags set. + * @param rej_flags don't print options which have any of those flags set. + */ +void show_help_options(const OptionDef *options, const char *msg, int req_flags, + int rej_flags); /** * Show help for all options with given flags in class and all its |