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)
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

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

Simple merge