[FFmpeg-cvslog] Merge commit '58b42345b38b46d11c32e11d9c57517f99d6a601'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct 10 09:32:59 2015 +0200| [a71fff213d5610abea25548f7c44e490a661eb45] | committer: Hendrik Leppkes

Merge commit '58b42345b38b46d11c32e11d9c57517f99d6a601'

* commit '58b42345b38b46d11c32e11d9c57517f99d6a601':
  dcadec: reorganise context data

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

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