Merge commit '77c23704c769168e4210956314775a1931f6aa0b'
authorJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:26:57 +0000 (20:26 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:26:57 +0000 (20:26 -0300)
commitd96363cc8437c9de8fd747068ab331510149810c
tree120a039b2802620d855056253fb48d9d6c5596c2
parentc1f22c29593048ce2c457f8c592627234503bd4b
parent77c23704c769168e4210956314775a1931f6aa0b
Merge commit '77c23704c769168e4210956314775a1931f6aa0b'

* commit '77c23704c769168e4210956314775a1931f6aa0b':
  avcodec: Mark some codecs with threadsafe init as such

This commit is a noop, see 91ed4e71967f19824237de4c374f038b543c7555

Merged-by: James Almer <jamrial@gmail.com>