[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 17 20:15:18 2013 +0200| [57c018d54272385afeb8e45972b36e9fc02d9732] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

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

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