From e903237666d3341610f772271fe7ccd7cd42a3be Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 3 Feb 2026 22:19:16 +0100 Subject: [PATCH] swresample: Check ch layouts in swr_alloc_set_opts2() This way we can error out earlier Signed-off-by: Michael Niedermayer (cherry picked from commit 0e3ac1f4f9474a6bea91864b103f845c79e22fc1) Signed-off-by: Michael Niedermayer --- libswresample/swresample.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index e908770699..cb2238a4a2 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -68,6 +68,8 @@ int swr_alloc_set_opts2(struct SwrContext **ps, if ((ret = av_opt_set_chlayout(s, "ochl", out_ch_layout, 0)) < 0) goto fail; + if ((ret = swri_check_chlayout(s, out_ch_layout, "ochl")) < 0) + goto fail; if ((ret = av_opt_set_int(s, "osf", out_sample_fmt, 0)) < 0) goto fail; @@ -77,6 +79,8 @@ int swr_alloc_set_opts2(struct SwrContext **ps, if ((ret = av_opt_set_chlayout(s, "ichl", in_ch_layout, 0)) < 0) goto fail; + if ((ret = swri_check_chlayout(s, in_ch_layout, "ichl")) < 0) + goto fail; if ((ret = av_opt_set_int(s, "isf", in_sample_fmt, 0)) < 0) goto fail;