Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'

* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
  h264: always set redundant_pic_count during slice header parsing

Merged-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2016-08-03 19:09:19 -07:00
commit e0c8250a59
1 changed files with 1 additions and 0 deletions

View File

@ -1624,6 +1624,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
sl->delta_poc[1] = get_se_golomb(&sl->gb);
}
sl->redundant_pic_count = 0;
if (pps->redundant_pic_cnt_present)
sl->redundant_pic_count = get_ue_golomb(&sl->gb);