[FFmpeg-cvslog] Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:07:41 2016 +0200| [ee7d01e81a7f54d53a6107eb2ea37fd6598309a9] | committer: Clément Bœsch

Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'

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

This commit is a noop, see 8e069eb525d46b8f89089e37fc7ac81b2d9b1092

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee7d01e81a7f54d53a6107eb2ea37fd6598309a9
---