diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 19:09:19 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 19:09:19 -0700 |
| commit | e0c8250a59adbf7135adb870be275df05a61e052 (patch) | |
| tree | f2ab3319d332f038b1b0ec781ec23656ebff34a4 /libavcodec | |
| parent | d3426fb5921d069cd950e43504b005bfbb1686d2 (diff) | |
| parent | 6efc4638584e1e14d1a6152186ba28f5d48a80c0 (diff) | |
| download | ffmpeg-e0c8250a59adbf7135adb870be275df05a61e052.tar.gz | |
Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'
* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
h264: always set redundant_pic_count during slice header parsing
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ade41f5d35..c2490cbd45 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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); |