Merge commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:54:04 +0000 (14:54 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:54:04 +0000 (14:54 +0200)
commit628174990971e05277dc638876fc7f00052dbb8a
tree8542b729c5a86c7aa4e4f114908a36a80e92faaa
parenta34dfc93efe380dd9c2b147e227caa14b063d32f
parent17e41cf3614973258c24aa2452215ef7e3bfa5ed
Merge commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed'

* commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed':
  avcodec: Do not lock during init if there is no init function

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