]> git.sesse.net Git - ffmpeg/commitdiff
hevcdec: properly export some side data with frame threading
authorwm4 <nfxjfg@googlemail.com>
Thu, 29 Jun 2017 13:36:55 +0000 (15:36 +0200)
committerwm4 <nfxjfg@googlemail.com>
Fri, 30 Jun 2017 17:18:11 +0000 (19:18 +0200)
I noticed this with mastering display data. If frame threading is
enabled, this side data is exported only for some frames. It turns out
it's not properly propagated to the worker threads.

I didn't touch A53 captions, because that involves memory allocation and
freeing the data as side data is exported.

Micro bump so that API users can detect the bug fix.

libavcodec/hevcdec.c
libavcodec/version.h

index 3b24fb9bec195d8bb9277bee5ff6a70504dba272..cc8ac82164e03cddc3901850c57e5cc5d530cbd5 100644 (file)
@@ -3355,6 +3355,12 @@ static int hevc_update_thread_context(AVCodecContext *dst,
         s->max_ra = INT_MAX;
     }
 
+    s->sei.frame_packing        = s0->sei.frame_packing;
+    s->sei.display_orientation  = s0->sei.display_orientation;
+    s->sei.mastering_display    = s0->sei.mastering_display;
+    s->sei.content_light        = s0->sei.content_light;
+    s->sei.alternative_transfer = s0->sei.alternative_transfer;
+
     return 0;
 }
 
index 06615268f314b1a78dc6d2ec169401738e66726e..3c5fea93274bfa189e880d7fe400ccffb8702177 100644 (file)
@@ -29,7 +29,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR  57
 #define LIBAVCODEC_VERSION_MINOR 100
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MICRO 103
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \