diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 13:24:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 14:26:17 +0200 |
| commit | 6679d5f29a1719b6aa53b74649e8b199bf562f53 (patch) | |
| tree | 926c25e1dd91239a2a49d4d0b857648236f50bee | |
| parent | 1c6ae98d4a9ff9ea607df87908393eda4ebdf4e8 (diff) | |
| download | ffmpeg-6679d5f29a1719b6aa53b74649e8b199bf562f53.tar.gz | |
avcodec/hevc: Simplify entry_point_offset parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 54cb341612..459030c7e1 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -717,8 +717,6 @@ static int hls_slice_header(HEVCContext *s) sh->num_entry_point_offsets = num_entry_point_offsets; if (sh->num_entry_point_offsets > 0) { int offset_len = get_ue_golomb_long(gb) + 1; - int segments = offset_len >> 4; - int rest = (offset_len & 15); if (offset_len < 1 || offset_len > 32) { sh->num_entry_point_offsets = 0; @@ -738,15 +736,7 @@ static int hls_slice_header(HEVCContext *s) return AVERROR(ENOMEM); } for (i = 0; i < sh->num_entry_point_offsets; i++) { - int val = 0; - for (j = 0; j < segments; j++) { - val <<= 16; - val += get_bits(gb, 16); - } - if (rest) { - val <<= rest; - val += get_bits(gb, rest); - } + unsigned val = get_bits_long(gb, offset_len); sh->entry_point_offset[i] = val + 1; // +1; // +1 to get the size } if (s->threads_number > 1 && (s->pps->num_tile_rows > 1 || s->pps->num_tile_columns > 1)) { |