aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMark Harris <mark.hsj@gmail.com>2015-12-28 23:04:08 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-29 13:11:51 +0100
commitc51c08e0e70c186971385bdbb225f69edd4e3375 (patch)
treecdced95a7ae4749374e575984e7e5c956c45f8a2 /libavcodec/h264.c
parentefa666e0da5e5fd2ded2e7dce4191bf04ac35952 (diff)
downloadffmpeg-c51c08e0e70c186971385bdbb225f69edd4e3375.tar.gz
avcodec: Use get_ue_golomb_long() when needed
get_ue_golomb() cannot decode values larger than 8190 (the maximum value that can be golomb encoded in 25 bits) and produces the error "Invalid UE golomb code" if a larger value is encountered. Use get_ue_golomb_long() instead (which supports 63 bits, up to 4294967294) when valid h264/hevc values can exceed 8190. This updates decoding of the following values: (maximum) first_mb_in_slice 36863* for level 5.2 abs_diff_pic_num_minus1 131071 difference_of_pic_nums_minus1 131071 idr_pic_id 65535 recovery_frame_cnt 65535 frame_packing_arrangement_id 4294967294 frame_packing_arrangement_repetition_period 16384 display_orientation_repetition_period 16384 An alternative would be to modify get_ue_golomb() to handle encoded values of up to 49 bits as was done for get_se_golomb() in a92816c. In that case get_ue_golomb() could continue to be used for all of these except frame_packing_arrangement_id. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 089a86fe42..139011b60b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1365,7 +1365,7 @@ static int get_last_needed_nal(H264Context *h, const uint8_t *buf, int buf_size)
case NAL_IDR_SLICE:
case NAL_SLICE:
init_get_bits(&gb, ptr, bit_length);
- if (!get_ue_golomb(&gb) ||
+ if (!get_ue_golomb_long(&gb) || // first_mb_in_slice
!first_slice ||
first_slice != h->nal_unit_type)
nals_needed = nal_index;