Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:23:46 +0000 (14:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:23:46 +0000 (14:23 +0200)
* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac':
  fate: explicitly set the default THREADS value

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/Makefile

diff --cc tests/Makefile
@@@ -1,5 -1,4 +1,6 @@@
 +FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
 +
+ THREADS = 1
  VREF = tests/vsynth1/00.pgm
  AREF = tests/data/asynth1.sw