Michael Niedermayer 9e7f1474dd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: add tests for SANM and VIMA

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/sanm

See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:43:02 +02:00
..
2014-03-22 17:50:02 +01:00
2014-01-15 21:20:47 +01:00
2013-07-29 19:20:27 +02:00
2013-08-08 22:59:42 +02:00
2014-04-06 16:42:15 +02:00