[FFmpeg-cvslog] Merge commit '40d949677335a564f769823f4afdb7e7a3da8d6b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Jan  2 17:52:34 2016 +0100| [7fe77aa62ea2ca376057436a6c36a759e8273f15] | committer: Hendrik Leppkes

Merge commit '40d949677335a564f769823f4afdb7e7a3da8d6b'

* commit '40d949677335a564f769823f4afdb7e7a3da8d6b':
  dca: use defines for subband related constants

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

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