diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:47:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 14:07:00 +0200 |
| commit | 8d4e969afe6bd15143a8a511587640417b0fb6dd (patch) | |
| tree | 1608095a543b1c3549f20f9ab2d9e326e6e8169e /cmdutils.c | |
| parent | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (diff) | |
| parent | 129bb238430ec45a3b5f8f1d384df590ddf7b62f (diff) | |
| download | ffmpeg-8d4e969afe6bd15143a8a511587640417b0fb6dd.tar.gz | |
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index 542634924e..abe0fdf6c3 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1660,6 +1660,10 @@ static void show_help_filter(const char *name) printf("Filter %s\n", f->name); if (f->description) printf(" %s\n", f->description); + + if (f->flags & AVFILTER_FLAG_SLICE_THREADS) + printf(" slice threading supported\n"); + printf(" Inputs:\n"); count = avfilter_pad_count(f->inputs); for (i = 0; i < count; i++) { |