This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/8.0 in repository ffmpeg. commit bfa334de42a5d81df2bcea67113acf718593aaf6 Author: James Almer <jamrial@gmail.com> AuthorDate: Sat Dec 27 19:11:07 2025 -0300 Commit: James Almer <jamrial@gmail.com> CommitDate: Tue Dec 30 20:23:51 2025 -0300 avformat/iamf_writer: check that stream count is consistent for ambisonic Audio Elements Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit a0fc454871c116d5bd1bbec5138dfe3ffcb1f11d) --- libavformat/iamf_writer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 4ad6521f31..c2de13b543 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -659,8 +659,12 @@ static int ambisonics_config(const IAMFAudioElement *audio_element, AVIOContext *dyn_bc) { const AVIAMFAudioElement *element = audio_element->celement; + const IAMFLayer *ilayer = &audio_element->layers[0]; const AVIAMFLayer *layer = element->layers[0]; + if (audio_element->nb_substreams != ilayer->substream_count) + return AVERROR(EINVAL); + ffio_write_leb(dyn_bc, 0); // ambisonics_mode avio_w8(dyn_bc, layer->ch_layout.nb_channels); // output_channel_count avio_w8(dyn_bc, audio_element->nb_substreams); // substream_count