[FFmpeg-cvslog] cbs_apv: Always restore tracing state on split fragment error

Mark Thompson git at videolan.org
Mon May 5 19:29:28 EEST 2025


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sat May  3 17:04:32 2025 +0100| [135acc8e61cf294e09c00eee43482cc0bc624249] | committer: Mark Thompson

cbs_apv: Always restore tracing state on split fragment error

Fixes CID 1646769.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=135acc8e61cf294e09c00eee43482cc0bc624249
---

 libavcodec/cbs_apv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c
index e7dd04825c..ebf57d3bbb 100644
--- a/libavcodec/cbs_apv.c
+++ b/libavcodec/cbs_apv.c
@@ -230,14 +230,14 @@ static int cbs_apv_split_fragment(CodedBitstreamContext *ctx,
 
         err = cbs_apv_read_pbu_header(ctx, &gbc, &pbu_header);
         if (err < 0)
-            return err;
+            goto fail;
 
         // Could select/skip frames based on type/group_id here.
 
         err = ff_cbs_append_unit_data(frag, pbu_header.pbu_type,
                                       data, pbu_size, frag->data_ref);
         if (err < 0)
-            return err;
+            goto fail;
 
         data += pbu_size;
         size -= pbu_size;



More information about the ffmpeg-cvslog mailing list