Merge commit '0bad254300356005af4aef00a706bf2e8eee96bc'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:39:33 +0000 (17:39 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:39:33 +0000 (17:39 +0200)
commit3b95452ca8bb39ac2136c9212a80b921e37f18c8
tree78e1481733b8c1df861317cc40e189a02900b0e8
parent2aff557c6acbce2b2b604c6c620c66c892260062
parent0bad254300356005af4aef00a706bf2e8eee96bc
Merge commit '0bad254300356005af4aef00a706bf2e8eee96bc'

* commit '0bad254300356005af4aef00a706bf2e8eee96bc':
  h264: move initing the implicit pred weight table out of h264_slice_header_parse()

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