| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 13:33:37 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 13:33:37 (GMT) |
| commit | f81a8e89a1c2819bc0b39153023188f955d3c52c (patch) | |
| tree | 84a142e85b6c60bfda5ab01fa22eeb0b9d1a93ac | |
| parent | 7b6c0bda9e94a9214445f83a4a469110b235dbde (diff) | |
| parent | dc574658d15ad8f171dbdecbdce7197acf9424a0 (diff) | |
| download | ffmpeg-f81a8e89a1c2819bc0b39153023188f955d3c52c.zip ffmpeg-f81a8e89a1c2819bc0b39153023188f955d3c52c.tar.gz ffmpeg-f81a8e89a1c2819bc0b39153023188f955d3c52c.tar.bz2 | |
Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
avconv: print filter options in -h full output.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 493f61c..d06dac7 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2433,7 +2433,7 @@ void show_help_default(const char *opt, const char *arg) show_help_children(avformat_get_class(), flags); show_help_children(sws_get_class(), flags); show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM); - show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM); + show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM); } } |