diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 19:59:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 19:59:10 +0200 |
| commit | 9ac08d93b2aad6c34987ab68e55bce002c162423 (patch) | |
| tree | 61461ca68e99d90c452053eeda6d5dab076d3cb8 /cmdutils.c | |
| parent | 85f2c0124d898473d8f5bf8223206b7df486dad8 (diff) | |
| parent | 2dd09ebf5597fd5e4a573bee9cccf21ae821f286 (diff) | |
| download | ffmpeg-9ac08d93b2aad6c34987ab68e55bce002c162423.tar.gz | |
Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index 1143ea10d1..8bcc7ac913 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1543,7 +1543,8 @@ int show_protocols(void *optctx, const char *opt, const char *arg) int show_filters(void *optctx, const char *opt, const char *arg) { - const AVFilter av_unused(*filter) = NULL; +#if CONFIG_AVFILTER + const AVFilter *filter = NULL; char descr[64], *descr_cur; int i, j; const AVFilterPad *pad; @@ -1556,7 +1557,6 @@ int show_filters(void *optctx, const char *opt, const char *arg) " V = Video input/output\n" " N = Dynamic number and/or type of input/output\n" " | = Source or sink filter\n"); -#if CONFIG_AVFILTER while ((filter = avfilter_next(filter))) { descr_cur = descr; for (i = 0; i < 2; i++) { @@ -1581,6 +1581,8 @@ int show_filters(void *optctx, const char *opt, const char *arg) filter->process_command ? 'C' : '.', filter->name, descr, filter->description); } +#else + printf("No filters available: libavfilter disabled\n"); #endif return 0; } |