Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 08:28:14 +0000 (10:28 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 08:28:14 +0000 (10:28 +0200)
commitdea0a2b69aefe2310bd92539dde596cc8fc195e2
treef94e5af64a2e68b25cabfb290b5ff97e73391a28
parent04aefe205b285a07646c99a834dcea04cd8a0110
parente3c9041cfe2e6526802255583d27abf9a921863e
Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'

* commit 'e3c9041cfe2e6526802255583d27abf9a921863e':
  h264: allocate some tables per slice contexts, not threads

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