Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
authorTimothy Gu <timothygu99@gmail.com>
Wed, 3 Aug 2016 22:59:51 +0000 (15:59 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Wed, 3 Aug 2016 22:59:51 +0000 (15:59 -0700)
commit796027f22154c799e0063e2457b31e0cfd1dddae
tree3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c
parentbca30ed2b67f095fd31e07319a622ac30ad22978
parentd1d7678040cd60148f97b372cb4291bcc45b2e22
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'

* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
  h264: fix the check for mixed IDR/non-IDR slices

Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c

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