PR #22517 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22517
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22517.patch


>From 0cfeae9f81e68775106a85285a1d042b0bdbf754 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <[email protected]>
Date: Mon, 16 Mar 2026 11:35:49 +0800
Subject: [PATCH 1/2] avformat/lcevc: fix memleak on write_nalu() failure

Signed-off-by: Zhao Zhili <[email protected]>
---
 libavformat/lcevc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/lcevc.c b/libavformat/lcevc.c
index 1cadefce11..df87e6c9cc 100644
--- a/libavformat/lcevc.c
+++ b/libavformat/lcevc.c
@@ -226,13 +226,13 @@ int ff_isom_write_lvcc(AVIOContext *pb, const uint8_t 
*data, int len)
 
             ret = write_nalu(&lvcc, idr_pb, nal);
             if (ret < 0)
-                return ret;
+                goto fail;
         } else if (nal->type == LCEVC_NON_IDR_NUT) {
             nb_nidr++;
 
             ret = write_nalu(&lvcc, nidr_pb, nal);
             if (ret < 0)
-                return ret;
+                goto fail;
         }
     }
     idr_size = avio_get_dyn_buf(idr_pb, &idr);
-- 
2.52.0


>From 6c5ec1b2f4da41109fc8335be0a2f3d8657d690b Mon Sep 17 00:00:00 2001
From: Zhao Zhili <[email protected]>
Date: Mon, 16 Mar 2026 11:37:06 +0800
Subject: [PATCH 2/2] avformat/lcevc: fix wrong NAL count written for NON IDR

Signed-off-by: Zhao Zhili <[email protected]>
---
 libavformat/lcevc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/lcevc.c b/libavformat/lcevc.c
index df87e6c9cc..83217c2e79 100644
--- a/libavformat/lcevc.c
+++ b/libavformat/lcevc.c
@@ -264,7 +264,7 @@ int ff_isom_write_lvcc(AVIOContext *pb, const uint8_t 
*data, int len)
     }
     if (nb_nidr) {
         avio_w8(pb, LCEVC_NON_IDR_NUT);
-        avio_wb16(pb, nb_idr);
+        avio_wb16(pb, nb_nidr);
         avio_write(pb, nidr, nidr_size);
     }
 
-- 
2.52.0

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

Reply via email to