Merge commit 'fa57059079190242517701120cfdccad93c866da'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:29:38 +0000 (15:29 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:29:38 +0000 (15:29 +0200)
commitcdecb39fca81967ff9e021c776b3212b1870188e
tree9da080384bd6a260d29c8963a7195b6c54dc097e
parent527a57932765f493529449f13d0d79ee5c7116e1
parentfa57059079190242517701120cfdccad93c866da
Merge commit 'fa57059079190242517701120cfdccad93c866da'

* commit 'fa57059079190242517701120cfdccad93c866da':
  h264: move initialising the implicit pred weight table for MBAFF

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