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)
* commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f':
  cpu-test: test av_cpu_count

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

diff --cc libavutil/cpu.c
Simple merge
@@@ -25,13 -25,9 +25,13 @@@ FATE_LIBAVUTIL += fate-blowfis
  fate-blowfish: libavutil/blowfish-test$(EXESUF)
  fate-blowfish: CMD = run libavutil/blowfish-test
  
 +FATE_LIBAVUTIL += fate-bprint
 +fate-bprint: libavutil/bprint-test$(EXESUF)
 +fate-bprint: CMD = run libavutil/bprint-test
 +
  FATE_LIBAVUTIL += fate-cpu
  fate-cpu: libavutil/cpu-test$(EXESUF)
- fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%)
+ fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
  fate-cpu: REF = /dev/null
  
  FATE_LIBAVUTIL += fate-crc