Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:03:12 +0000 (15:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:03:12 +0000 (15:03 +0200)
commitd7a2451688442d2736f4811267277c7051f414a6
treef5dcfebd6432f892a763de6c4bcdfc7f1ad1cb5f
parent7f607120d99762b07b94e97ce3e32a60b8d114a2
parentb16e9b9ac9db449cae2242767dd3c3fc309357c4
Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'

* commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4':
  h264: move initialising the explicit pred weight table for MBAFF

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