[FFmpeg-cvslog] Merge commit '90e648c508fa6b97587ce62699a1449123f7d285'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 10:32:38 2015 +0200| [cf1ccfffa4b72d6dc39ea8a04bc391a4ff268fb8] | committer: Hendrik Leppkes

Merge commit '90e648c508fa6b97587ce62699a1449123f7d285'

* commit '90e648c508fa6b97587ce62699a1449123f7d285':
  fate/mp3: use the f32le format as output

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf1ccfffa4b72d6dc39ea8a04bc391a4ff268fb8
---