RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac' 

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

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-04 14:23:46 +02:00
parent 491c52d3b0 23dfa00b88
commit fac292b8cd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile
View File

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