diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:18:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:19:39 +0100 |
| commit | 29ba1cff2b79dbac989a966aaa0cdca9d01db7cb (patch) | |
| tree | 1c8d93ad4853c8770e41d14575ddb97ddb810bc9 /libavcodec/hevc_ps.c | |
| parent | 7c4b96f55eb60789031bbade74dc2a0f65f616f4 (diff) | |
| parent | b37e796082b2d787aff3cd5631bb89c4fd374708 (diff) | |
Merge commit 'b37e796082b2d787aff3cd5631bb89c4fd374708'
* commit 'b37e796082b2d787aff3cd5631bb89c4fd374708':
hevc: Use uint64 to check for tile dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index b7a01bbe20..26666a1f88 100644 --- a/libavcodec/hevc_ps.c +++ b/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]; |