Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:03:49 +0000 (23:03 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:03:49 +0000 (23:03 +0200)
commitd307c44bafc67ffa5c05c49148d994e64266d3b9
tree1611316e9a549e742219822c85dc72db7e92eae6
parentba94e985a33d8e0feb545b09854e711a331c5343
parent504e3f75bf73a488d39a80a42962bae2a353dd6b
Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'

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

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