[FFmpeg-cvslog] Merge commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:36:42 2015 +0200| [a11741c293939193657a82e6055a37dfc6ed910c] | committer: Hendrik Leppkes

Merge commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5'

* commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5':
  dcadec: make a number of samples per subband per subsubframe a named constant

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

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