diff mbox series

[FFmpeg-devel] avcodec/hevcdec: don't store stale HDR10+ values

Message ID 20231114153138.2744-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] avcodec/hevcdec: don't store stale HDR10+ values | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer Nov. 14, 2023, 3:31 p.m. UTC 
This metadata is signaled per frame. If not present in an AU, then the previous
values should not be used.

Should fix ticket #10541.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/hevcdec.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 3ce845dddb..13c37e1e3b 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -2805,14 +2805,12 @@  static int set_side_data(HEVCContext *s)
     }
 
     if (s->sei.common.dynamic_hdr_plus.info) {
-        AVBufferRef *info_ref = av_buffer_ref(s->sei.common.dynamic_hdr_plus.info);
-        if (!info_ref)
-            return AVERROR(ENOMEM);
-
-        if (!av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, info_ref)) {
-            av_buffer_unref(&info_ref);
+        if (!av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
+                                             s->sei.common.dynamic_hdr_plus.info)) {
+            av_buffer_unref(&s->sei.common.dynamic_hdr_plus.info);
             return AVERROR(ENOMEM);
         }
+        s->sei.common.dynamic_hdr_plus.info = NULL;
     }
 
     if (s->rpu_buf) {