Commit 8aaab111 authored by Anton Khirnov's avatar Anton Khirnov

af_channelmap: ensure the output channel layout is valid.

parent 949c603e
...@@ -270,6 +270,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx) ...@@ -270,6 +270,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
} }
s->output_layout = fmt; 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); ff_add_channel_layout(&s->channel_layouts, s->output_layout);
if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) { if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment