[FFmpeg-cvslog] Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'

[Timothy Gu]

ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Wed Aug  3 19:09:19 2016 -0700| [e0c8250a59adbf7135adb870be275df05a61e052] | committer: Timothy Gu

Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'

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

Merged-by: Timothy Gu <timothygu99 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0c8250a59adbf7135adb870be275df05a61e052
---

 libavcodec/h264_slice.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index ade41f5..c2490cb 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);
 


======================================================================