Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 12:58:31 +0000 (14:58 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 12:58:31 +0000 (14:58 +0200)
commit3c5a3882f988aba19a984e80119d72ca9d32b7d4
tree157468878c7e9dc9048d8b9694f6b2a239ca93f5
parentc54e2740e1f4a8fb7fa4e521755bf4158c4cda51
parent77a1e2c5f8f8250dfacff24b993eb473260ed13e
Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'

* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e':
  h264: move direct mode inits out of h264_slice_header_parse()

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