[FFmpeg-cvslog] Merge commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:29:19 2015 +0200| [98ca981a238c4db5145fc705561ce1b29b2fc8f0] | committer: Hendrik Leppkes

Merge commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44'

* commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44':
  build: Add support for known custom allocators

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

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