Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 05:00:48 +0000 (07:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 05:32:11 +0000 (07:32 +0200)
commitde80cebdd7fbb790077a2f93906370f5a40af8b9
tree6bf8f9c2dd1995262f9aad6c3c248ec7204560d5
parent830a567e96a232943aad93ff67e73471aad19f55
parent9ab5f7107d2f1411e9fda6c36af64524e5ed31d1
Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile
tests/fate/libavresample.mak