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 /ffplay.c | |
| 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 'ffplay.c')
| -rw-r--r-- | ffplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3025,8 +3025,8 @@ void show_help_default(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); - show_help_options(options, "Main options:", 0, OPT_EXPERT); - show_help_options(options, "Advanced options:", OPT_EXPERT, 0); + show_help_options(options, "Main options:", 0, OPT_EXPERT, 0); + show_help_options(options, "Advanced options:", OPT_EXPERT, 0, 0); printf("\n"); show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); |