Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:07:41 +0000 (11:07 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:07:41 +0000 (11:07 +0200)
commitee7d01e81a7f54d53a6107eb2ea37fd6598309a9
tree4b8abd932b61ab59663a97c9a6568653d33d38e7
parentdd1b1e32238be7e0abfbc90f546f4c1931915143
parent6e2ad28cf76461b02d85ad178087ba0c628b8d9d
Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'

* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
  aic: add frame threading support

This commit is a noop, see 8e069eb525d46b8f89089e37fc7ac81b2d9b1092

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