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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep  3 04:48:43 2011 +0200| [23a287e9cc4bfebd98190f2442367f7c0c94099f] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  codec-regression: force vsync 0 on the me_threshold test to make sure frames match.

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

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