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@gmx.at>