The branch, master has been updated
via cac5018eb9278263e76ccc2891509ed662474853 (commit)
from f0f7834726286dab911c27f9d7efc58ba93382d3 (commit)
- Log -----------------------------------------------------------------
commit cac5018eb9278263e76ccc2891509ed662474853
Author: Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 25 13:00:34 2025 +0800
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 14:03:06 2025 +0000
avformat/mov: fix crash when stsz_sample_size is zero and sample_sizes is
null
Co-Authored-by: James Almer <[email protected]>
Signed-off-by: Zhao Zhili <[email protected]>
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ef190106f9..db8f8208a6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5164,7 +5164,8 @@ static int sanity_checks(void *log_obj, MOVStreamContext
*sc, int index)
{
if ((sc->chunk_count && (!sc->stts_count || !sc->stsc_count ||
(!sc->sample_size && !sc->sample_count))) ||
- (!sc->chunk_count && sc->sample_count)) {
+ (sc->sample_count && (!sc->chunk_count ||
+ (!sc->sample_size && !sc->sample_sizes)))) {
av_log(log_obj, AV_LOG_ERROR, "stream %d, missing mandatory atoms,
broken header\n",
index);
return 1;
-----------------------------------------------------------------------
Summary of changes:
libavformat/mov.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
