[FFmpeg-cvslog] Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 00:23:51 2013 +0100| [e9a47896a0d1cd8b6577f5a7752e158973d32d2a] | committer: Michael Niedermayer

Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'

* commit '25609b63d2e07d26d610f485a22082d32c96c0f5':
  dcadec: store the stereo downmix coefficients as float in the DCAContext.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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