Merge commit 'b37e796082b2d787aff3cd5631bb89c4fd374708'

* commit 'b37e796082b2d787aff3cd5631bb89c4fd374708':
  hevc: Use uint64 to check for tile dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/hevc.h

@@ -511,10 +511,10 @@ typedef struct HEVCPPS {
     uint8_t slice_header_extension_present_flag;
 
     // Inferred parameters
-    int *column_width;  ///< ColumnWidth
+    unsigned int *column_width;  ///< ColumnWidth
-    int *row_height;    ///< RowHeight
+    unsigned int *row_height;    ///< RowHeight
-    int *col_bd;        ///< ColBd
+    unsigned int *col_bd;        ///< ColBd
-    int *row_bd;        ///< RowBd
+    unsigned int *row_bd;        ///< RowBd
     int *col_idxX;
 
     int *ctb_addr_rs_to_ts; ///< CtbAddrRSToTS

libavcodec/hevc_ps.c

@@ -1111,7 +1111,7 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
 
         pps->uniform_spacing_flag = get_bits1(gb);
         if (!pps->uniform_spacing_flag) {
-            int sum = 0;
+            uint64_t sum = 0;
             for (i = 0; i < pps->num_tile_columns - 1; i++) {
                 pps->column_width[i] = get_ue_golomb_long(gb) + 1;
                 sum                 += pps->column_width[i];