Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:40:32 +0000 (02:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:47:34 +0000 (02:47 +0100)
commitad5e4e0f947ab686325fc7783afd18cd9cd88dc4
treed0b15c19897c45fb730a7d875ddc342e5a65190a
parentcf867517f15bb5c9618dea6e546592622c0773a5
parentb318106fae65149356934fc72feafef3272fd4ea
Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'

* commit 'b318106fae65149356934fc72feafef3272fd4ea':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

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