Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 31 Jul 2015 09:56:22 +0000 (11:56 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 31 Jul 2015 09:56:42 +0000 (11:56 +0200)
commit814d4c4c94c761c42b40004cc36d2f3bb1303da7
treeaca9b3851fd200e4f8eba3cbaf9769fdba5f4cdc
parentc1bfb99ff2445c7f3ba319ea342dd8004345d67a
parenta0797950527120c85263c910eb6ba08fddcfdcb3
Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'

* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
tests/fate/mp3.mak