generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'

Browse Source 
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
  cmdutils: Print a more sensible message in show_filters() w/o libavfilter

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-17 19:59:10 +02:00
commit 9ac08d93b2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdutils.c
View File

@ -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) 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; char descr[64], *descr_cur;
int i, j; int i, j;
const AVFilterPad *pad; const AVFilterPad *pad;
@ -1556,7 +1557,6 @@ int show_filters(void *optctx, const char *opt, const char *arg)
" V = Video input/output\n" " V = Video input/output\n"
" N = Dynamic number and/or type of input/output\n" " N = Dynamic number and/or type of input/output\n"
" | = Source or sink filter\n"); " | = Source or sink filter\n");
#if CONFIG_AVFILTER
while ((filter = avfilter_next(filter))) { while ((filter = avfilter_next(filter))) {
descr_cur = descr; descr_cur = descr;
for (i = 0; i < 2; i++) { 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->process_command ? 'C' : '.',
filter->name, descr, filter->description); filter->name, descr, filter->description);
} }
#else
printf("No filters available: libavfilter disabled\n");
#endif #endif
return 0; return 0;
} }