Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

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

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/80/head
Michael Niedermayer 10 years ago
parent 491c52d3b0 23dfa00b88
commit fac292b8cd
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      tests/Makefile

1
tests/Makefile
Unescape 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

Write Preview
Loading…
Cancel
Save