diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 9b77ef65bf..601e691596 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -385,8 +385,8 @@ av_cold int swr_init(struct SwrContext *s){ goto fail; } + av_channel_layout_describe(&s->out_ch_layout, l2, sizeof(l2)); #if FF_API_OLD_CHANNEL_LAYOUT - av_channel_layout_describe(&s->out_ch_layout, l1, sizeof(l1)); if (s->out_ch_layout.order != AV_CHANNEL_ORDER_UNSPEC && s->out.ch_count != s->out_ch_layout.nb_channels) { av_log(s, AV_LOG_ERROR, "Output channel layout %s mismatches specified channel count %d\n", l2, s->out.ch_count); ret = AVERROR(EINVAL);