Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac':
  fate: explicitly set the default THREADS value

Conflicts:
	tests/Makefile

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

tests/Makefile

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