diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:15:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:31:55 +0200 |
| commit | bb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (patch) | |
| tree | 2cb536f24abb5d9cfc275848da43d93d4302d0d2 /cmdutils.h | |
| parent | aee51039ee204197fdb4c924f8ee433b803ab1e1 (diff) | |
| parent | b96509c93ce6ebb0e997e0b2a55cf10c786a2812 (diff) | |
| download | ffmpeg-bb3ed3bae6a9e6e2dbe8deeb45088453f214b770.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add FATE tests for the Ut Video encoder
lavc: add Ut Video encoder
mpegvideo_enc: remove stray duplicate line from 7f9aaa4
swscale: x86: fix #endif comments in rgb2rgb template file
avconv: mark more options as expert.
avconv: split printing "main options" into global and per-file.
avconv: refactor help printing.
Conflicts:
Changelog
ffmpeg_opt.c
ffserver.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index 84ef3718df..fc36331cb1 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -178,9 +178,10 @@ typedef struct { * @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. + * @param alt_flags print only options that have at least one of those flags set */ void show_help_options(const OptionDef *options, const char *msg, int req_flags, - int rej_flags); + int rej_flags, int alt_flags); /** * Show help for all options with given flags in class and all its |