projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd1b1e3 6e2ad28)
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)
* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
  aic: add frame threading support

This commit is a noop, see 8e069eb525d46b8f89089e37fc7ac81b2d9b1092

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

Trivial merge
FFmpeg git repo