This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit e45f6f4337cb6c83dfda86aae1f4a1f88d4f6a58 Author: Michael Niedermayer <[email protected]> AuthorDate: Tue Feb 3 22:19:16 2026 +0100 Commit: Michael Niedermayer <[email protected]> CommitDate: Mon May 4 17:13:19 2026 +0200 swresample: Check ch layouts in swr_alloc_set_opts2() This way we can error out earlier Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 0e3ac1f4f9474a6bea91864b103f845c79e22fc1) Signed-off-by: Michael Niedermayer <[email protected]> --- libswresample/swresample.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index bd4ef4ad3e..2531593a44 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -113,6 +113,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; @@ -122,6 +124,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; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
