git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 17 Oct 2013 18:15:18 +0000 (20:15 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 17 Oct 2013 18:15:22 +0000 (20:15 +0200)
commit	57c018d54272385afeb8e45972b36e9fc02d9732
tree	4e5b988b22c341a916356188ebd07c50bcc6b491	tree \| snapshot
parent	123c6ca80983d57392dae85576ed30f011e496bc	commit \| diff
parent	a27f1116cdfe49ea5136f0460d6648aec517bb13	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
fate: Increase the tolerance in the lavr tests

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