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 55da57f72377d4d6de5b80655614fc0161c0a0b0
Author:     Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 25 13:00:34 2025 +0800
Commit:     Michael Niedermayer <[email protected]>
CommitDate: Thu Jun 18 05:09:43 2026 +0200

    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]>
    (cherry picked from commit cac5018eb9278263e76ccc2891509ed662474853)
    Signed-off-by: Michael Niedermayer <[email protected]>
---
 libavformat/mov.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8d6dc0201e..58518dc8a7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5140,7 +5140,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;

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to