[FFmpeg-cvslog] Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 13:45:19 2015 +0200| [2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98] | committer: Hendrik Leppkes

Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'

* commit 'a5d58fea68b9212e0065a71939e921505504a9bb':
  lavc: reimplement avcodec_get_type() using codec descriptors

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

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