diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 18:30:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 18:31:04 +0400 |
| commit | 5b93b2722dea3e73612fe3001113387f842ed9f8 (patch) | |
| tree | 58a7dd5a716a0043e4c9921e893b58cc6dfbae2d /libavcodec/hevc.c | |
| parent | c7b454f7a42e3d92ab54fcb40c3d12cf8b7efc70 (diff) | |
| parent | 838740e6420538ad45982da6b1d3aa3ae91307f5 (diff) | |
Merge commit '838740e6420538ad45982da6b1d3aa3ae91307f5'
* commit '838740e6420538ad45982da6b1d3aa3ae91307f5':
hevc: Prevent some integer overflows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index f8e81a7f0e..4d1feb4f38 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -233,7 +233,7 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb) const HEVCSPS *sps = s->sps; int max_poc_lsb = 1 << sps->log2_max_poc_lsb; int prev_delta_msb = 0; - int nb_sps = 0, nb_sh; + unsigned int nb_sps = 0, nb_sh; int i; rps->nb_refs = 0; @@ -681,7 +681,7 @@ static int hls_slice_header(HEVCContext *s) } if (s->pps->slice_header_extension_present_flag) { - int length = get_ue_golomb_long(gb); + unsigned int length = get_ue_golomb_long(gb); for (i = 0; i < length; i++) skip_bits(gb, 8); // slice_header_extension_data_byte } |