diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:08:40 +0200 |
| commit | 835cc0f2e7098fbb548d7622110c4fdc0831809d (patch) | |
| tree | 22408566623b068dd3eb0ab2a49751fb1ecde67d /cmdutils.c | |
| parent | f4db6bfeb86feda2aeb98072e55b55de85ba0962 (diff) | |
| parent | fa2a34cd40d124161c748bb0f430dc63c94dd0da (diff) | |
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmdutils.c b/cmdutils.c index 4634ae20ff..bdcbebd4c2 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1448,21 +1448,21 @@ int show_protocols(void *optctx, const char *opt, const char *arg) int show_filters(void *optctx, const char *opt, const char *arg) { - AVFilter av_unused(**filter) = NULL; + const AVFilter av_unused(*filter) = NULL; char descr[64], *descr_cur; int i, j; const AVFilterPad *pad; printf("Filters:\n"); #if CONFIG_AVFILTER - while ((filter = av_filter_next(filter)) && *filter) { + while ((filter = avfilter_next(filter))) { descr_cur = descr; for (i = 0; i < 2; i++) { if (i) { *(descr_cur++) = '-'; *(descr_cur++) = '>'; } - pad = i ? (*filter)->outputs : (*filter)->inputs; + pad = i ? filter->outputs : filter->inputs; for (j = 0; pad && pad[j].name; j++) { if (descr_cur >= descr + sizeof(descr) - 4) break; @@ -1472,7 +1472,7 @@ int show_filters(void *optctx, const char *opt, const char *arg) *(descr_cur++) = '|'; } *descr_cur = 0; - printf("%-16s %-10s %s\n", (*filter)->name, descr, (*filter)->description); + printf("%-16s %-10s %s\n", filter->name, descr, filter->description); } #endif return 0; |