diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:16:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:16:31 +0200 |
| commit | e41d3aba0123c1089b55aa7dc6371973a0c3a39e (patch) | |
| tree | 5b17e7bf6fd3d7103e99cc9296de1b9070bd04c3 /libavfilter/graphparser.c | |
| parent | a1b88797144111262b07cde42b038387a3c6578b (diff) | |
| parent | c22263d3e813d442df8fa5f5ba8993573fe775d8 (diff) | |
| download | ffmpeg-e41d3aba0123c1089b55aa7dc6371973a0c3a39e.tar.gz | |
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
graphparser: only print filter arguments if they are non-NULL
af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 3718d09c99..9241cf3bf2 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -126,7 +126,10 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind ret = avfilter_init_str(*filt_ctx, args); if (ret < 0) { av_log(log_ctx, AV_LOG_ERROR, - "Error initializing filter '%s' with args '%s'\n", filt_name, args); + "Error initializing filter '%s'", filt_name); + if (args) + av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args); + av_log(log_ctx, AV_LOG_ERROR, "\n"); return ret; } |