[FFmpeg-cvslog] Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 07:00:48 2013 +0200| [de80cebdd7fbb790077a2f93906370f5a40af8b9] | committer: Michael Niedermayer

Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

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

The tests do not pass, and thus where disabled

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de80cebdd7fbb790077a2f93906370f5a40af8b9
---