Merge commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85'
authorClément Bœsch <clement@stupeflix.com>
Thu, 30 Jun 2016 08:15:51 +0000 (10:15 +0200)
committerClément Bœsch <clement@stupeflix.com>
Thu, 30 Jun 2016 08:15:51 +0000 (10:15 +0200)
commitd407e76c42d5ae79791ff88d3bd5185e10ad6047
tree2c77d67281ef3e29bf9a0e6f69bfb83ba3a55fff
parent879330c561f4214bd81c35f46f31dd7fe906a59a
parent2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85
Merge commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85'

* commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85':
  h264: decode the MMCOs into per-slice contexts

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