[FFmpeg-cvslog] Merge commit '1a094af638281295bf087945923d258b5acd1ab1'

Wed Apr 13 15:32:31 CEST 2016

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 14:31:27 2016 +0100| [546bf316cad21dd80daed6a38bb01ad83ebaec27] | committer: Derek Buitenhuis

Merge commit '1a094af638281295bf087945923d258b5acd1ab1'

This commit is a no-op. The value of the refactoring is dubious and
merging it is error prone. If someone feels strongly about merging it,
let me know, and I will.

* commit '1a094af638281295bf087945923d258b5acd1ab1':
  fft: Split MDCT bits off from FFT

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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