Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 23:26:18 +0000 (00:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 23:35:05 +0000 (00:35 +0100)
commit927696aab258c7184ceac9765a305b5f91eef8dc
tree309d7998698b88ac531d8bc6967cedd22388063f
parenta3be0c334e8ba7e447a734aa2be862815e5daf85
parent5a0bccd2810d22b1dd515e650911212a310300de
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: force the simple idct for xvid custom matrix test

Conflicts:
tests/fate/xvid.mak
tests/ref/fate/xvid-custom-matrix

See: ef034cbf185e1938000a117bd16aa6b33046f479
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/ref/fate/xvid-idctmmx