diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 18:52:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 18:55:08 +0400 |
commit | 67a6dac7c18caecb418f7590a484dcbfcad869ab (patch) | |
tree | dfc518e76432ade673085eb8003c25edefb5fc53 /ffprobe.c | |
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 'ffprobe.c')
-rw-r--r-- | ffprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2076,7 +2076,7 @@ static int show_help(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); - show_help_options(options, "Main options:\n", 0, 0); + show_help_options(options, "Main options:", 0, 0); printf("\n"); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); |