Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 02:46:06 +0000 (19:46 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 02:50:06 +0000 (19:50 -0700)
commitde625312862a99500ce7aa1703b5d783ae66d704
tree0590e6448b83540302ca747e80d3ee7309a088c4
parente0c8250a59adbf7135adb870be275df05a61e052
parente26c64148be8a20ace7512d96503172fb5e9753b
Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'

* commit 'e26c64148be8a20ace7512d96503172fb5e9753b':
  h264: discard slices of redundant pictures right after parsing the slice header

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

TODO: fix indentation

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