[FFmpeg-cvslog] Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 04:05:25 2014 +0200| [7fd7aa6b2b8471eaaf712b6a3839f7304f13cabd] | committer: Michael Niedermayer

Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

* commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f':
  cpu-test: test av_cpu_count

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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