Merge commit '87a814fdce522d45aa31aa258cb5514d7e754bff'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)
* commit '87a814fdce522d45aa31aa258cb5514d7e754bff':
  libavcodec: Add missing AVClass pointers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge