Merge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7'

[ffmpeg] / libavcodec / hevc_ps.h

diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h
index 016f0075d4c4edf37964e36b5301448bf787af2f..4e6c3bc8496fcb2d44bb85aafaea7df87f0bc1b6 100644 (file)
--- a/libavcodec/hevc_ps.h
+++ b/libavcodec/hevc_ps.h
@@ -227,8 +227,6 @@ typedef struct HEVCSPS {
     int chroma_format_idc;
     uint8_t separate_colour_plane_flag;
 
-    ///< output (i.e. cropped) values
-    int output_width, output_height;
     HEVCWindow output_window;
 
     HEVCWindow pic_conf_win;
@@ -368,8 +366,8 @@ typedef struct HEVCPPS {
     uint8_t chroma_qp_offset_list_enabled_flag;
     uint8_t diff_cu_chroma_qp_offset_depth;
     uint8_t chroma_qp_offset_list_len_minus1;
-    int8_t  cb_qp_offset_list[5];
-    int8_t  cr_qp_offset_list[5];
+    int8_t  cb_qp_offset_list[6];
+    int8_t  cr_qp_offset_list[6];
     uint8_t log2_sao_offset_scale_luma;
     uint8_t log2_sao_offset_scale_chroma;