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/af_channelmap.c | |
| parent | a1b88797144111262b07cde42b038387a3c6578b (diff) | |
| parent | c22263d3e813d442df8fa5f5ba8993573fe775d8 (diff) | |
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/af_channelmap.c')
| -rw-r--r-- | libavfilter/af_channelmap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 810615fedc..50e961cd4b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -271,6 +271,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx) } s->output_layout = fmt; } + if (!s->output_layout) { + av_log(ctx, AV_LOG_ERROR, "Output channel layout is not set and " + "cannot be guessed from the maps.\n"); + return AVERROR(EINVAL); + } + ff_add_channel_layout(&s->channel_layouts, s->output_layout); if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) { |