Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 12:55:02 +0000 (14:55 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 12:55:02 +0000 (14:55 +0200)
commitc54e2740e1f4a8fb7fa4e521755bf4158c4cda51
tree9c1e28a584b2e48d6a8107c602fe4166078bf334
parent0c50f6905fb3cc18577e17db1993dc959d6a3db5
parentd06e4d8aab9c679b6aea2591d2a9b382df9e5f74
Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74'

* commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74':
  h264: start splitting decode_slice_header()

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264_slice.c