[FFmpeg-cvslog] Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 14:23:46 2014 +0200| [fac292b8cd4b1374471f0ab2900cdd242de3d1ef] | committer: Michael Niedermayer

Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

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

Conflicts:
	tests/Makefile

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fac292b8cd4b1374471f0ab2900cdd242de3d1ef
---