The branch, master has been updated
via faa382e5b196f2acb5bc5b159aaf06682291328b (commit)
via 554ae5ada98cd44686ade995102d3aa2295d7b09 (commit)
from 3bcf2be06c8cfe6834b287327c2d3bb891c7440d (commit)
- Log -----------------------------------------------------------------
commit faa382e5b196f2acb5bc5b159aaf06682291328b
Author: James Almer <[email protected]>
AuthorDate: Tue Nov 25 12:42:30 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Wed Nov 26 12:01:17 2025 -0300
avformat/iamf_parse: ensure the stream count in a scalable channel
representation is equal to the audio element's stream count
Signed-off-by: James Almer <[email protected]>
diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 737e3f7404..597d800be0 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -480,6 +480,9 @@ static int scalable_channel_layout_config(void *s,
AVIOContext *pb,
av_channel_layout_copy(&layer->ch_layout, &ch_layout);
}
+ if (k != audio_element->nb_substreams)
+ return AVERROR_INVALIDDATA;
+
return 0;
}
commit 554ae5ada98cd44686ade995102d3aa2295d7b09
Author: James Almer <[email protected]>
AuthorDate: Tue Nov 25 10:26:27 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Wed Nov 26 12:01:17 2025 -0300
avformat/iamf_parse: ensure each layout in an scalable channel
representation has an increasing number of channels
Fixes issue #21013
Signed-off-by: James Almer <[email protected]>
diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 50acd7cf5a..737e3f7404 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -406,6 +406,9 @@ static int scalable_channel_layout_config(void *s,
AVIOContext *pb,
.nb_channels =
substream_count +
coupled_substream_count };
+ if (i && ch_layout.nb_channels <=
audio_element->element->layers[i-1]->ch_layout.nb_channels)
+ return AVERROR_INVALIDDATA;
+
for (int j = 0; j < substream_count; j++) {
IAMFSubStream *substream = &audio_element->substreams[k++];
-----------------------------------------------------------------------
Summary of changes:
libavformat/iamf_parse.c | 6 ++++++
1 file changed, 6 insertions(+)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
