Michael Niedermayer 814d4c4c94 Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-31 11:56:42 +02:00
..
2014-11-28 17:55:27 -05:00
2015-02-01 22:38:11 +01:00