Merge commit '5d45fe7da972da528915fbdfe3dbf22eb2effd01'

[ffmpeg] / libavcodec / hevcdec.h

diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index 0c7881286c5e959125489635ea4d04d42424406b..dfb12eff8bbc94cb808bd5d275a8512a9af5d819 100644 (file)
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -564,7 +564,7 @@ typedef struct HEVCContext {
     uint8_t is_md5;
 
     uint8_t context_initialized;
-    uint8_t is_nalff;       ///< this flag is != 0 if bitstream is encapsulated
+    int is_nalff;           ///< this flag is != 0 if bitstream is encapsulated
                             ///< as a format defined in 14496-15
     int apply_defdispwin;
 
@@ -596,6 +596,11 @@ typedef struct HEVCContext {
     uint32_t max_mastering_luminance;
     uint32_t min_mastering_luminance;
 
+    /* content light level */
+    int sei_content_light_present;
+    uint16_t max_content_light_level;
+    uint16_t max_pic_average_light_level;
+
 } HEVCContext;
 
 int ff_hevc_decode_nal_sei(HEVCContext *s);