Merge commit '641e57230b460bef52c88e61087d97c223910bea'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 01:10:21 +0000 (03:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 01:10:21 +0000 (03:10 +0200)
commitb2fb65cbebba73894a6b98cfa877fddd45f6d124
tree09e48bb2c6d7ec4c28d59e03eaab2510d9043e05
parentb3a647d9ce59cd75ccf4233eac871af91bebf0d0
parent641e57230b460bef52c88e61087d97c223910bea
Merge commit '641e57230b460bef52c88e61087d97c223910bea'

* commit '641e57230b460bef52c88e61087d97c223910bea':
  fate: add on2avc audio test

Conflicts:
tests/fate/audio.mak

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