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)
* commit 'fa57059079190242517701120cfdccad93c866da':
  h264: move initialising the implicit pred weight table for MBAFF

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

Simple merge