avcodec/hevc: Simplify entry_point_offset parsing
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 11:24:36 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 12:26:17 +0000 (14:26 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c

index 54cb341..459030c 100644 (file)
@@ -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)) {