Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:53:39 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:53:39 +0000 (21:53 +0100)
commit29d2197d880538550812db720539f8c4c4e89dc3
treefafe6366bcffe7d0cedd377affbc02465d94f2b2
parente821910a21510c2423c345b615602b42af26a70a
parentb727b0eeb73cd78533a7fd387ceccd505e48fa6c
Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
tests/fate/audio.mak

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