Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 02:09:19 +0000 (19:09 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 02:09:19 +0000 (19:09 -0700)
* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
  h264: always set redundant_pic_count during slice header parsing

Merged-by: Timothy Gu <timothygu99@gmail.com>
1  2 
libavcodec/h264_slice.c

Simple merge