Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:19 +0000 (13:45 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:19 +0000 (13:45 +0200)
commit2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98
treea4d52100c23e2575b1cabe222b2ea3732b901a58
parentb123d82c4182fc3842376ac1e078ec63bcd2e20c
parenta5d58fea68b9212e0065a71939e921505504a9bb
Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/codec_desc.c
libavcodec/utils.c