[FFmpeg-cvslog] Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct 16 22:46:23 2015 +0200| [0ad43d0f15e3aea2d089af93cc2d993ec25fdda6] | committer: Hendrik Leppkes

Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

* commit 'e240a28b20680b326a39b0860fda37d7e459bfc0':
  cmdutils: Add auto to threading capabilities report

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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