[FFmpeg-cvslog] Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct 16 23:03:49 2015 +0200| [d307c44bafc67ffa5c05c49148d994e64266d3b9] | committer: Hendrik Leppkes

Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'

* commit '504e3f75bf73a488d39a80a42962bae2a353dd6b':
  aac: Make codec init run under ff_thread_once

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

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