Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:05:25 +0000 (04:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:05:36 +0000 (04:05 +0200)
commit7fd7aa6b2b8471eaaf712b6a3839f7304f13cabd
tree09b87c38d6e56b3b88ed37a0d4b7db509399aa46
parent01fc6533aa4175bad4b926361d017801aff9c53c
parentcaf5ef852bf71984d3322bbeaf48cfb04ac8255f
Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/cpu.c
tests/fate/libavutil.mak