Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:38:30 +0000 (23:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:43:02 +0000 (23:43 +0200)
commit9e7f1474dd5f3d33794b46e9a6555031c5165023
treee2bb576a4701f7399fbf185ea638c63690ce8a14
parent5297003aa7a06e0223f3842b810d9fb10f67789d
parenta027d2a8731f7c95dbb57be470160f0f94d6c97d
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>
tests/fate/adpcm.mak
tests/fate/audio.mak