Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 00:13:06 +0000 (01:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 00:13:48 +0000 (01:13 +0100)
commitc69906151b50e7e5ebc8e0ef5906accfe7465f4f
tree3887b8a47d1d576e6a978e1b9970298401994edf
parent7546ac2fee40570aa6235cf04329bafdbbb449a4
parente2096e2eaa9e75663d6bf0c37d342752aa5a146d
Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'

* commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d':
  fate: Add a downsampled SBR testvector

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