Merge commit '971177f751a6e2931232accceab438bce277bde8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:08:22 +0000 (11:08 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:08:22 +0000 (11:08 +0200)
commitecaa6cf7b84ad03114b1240ea26491762b6e256f
tree583f407f043279a1c276879a9aa185e6e890c7ad
parent157969321a93735d70277381b98070ababd631cf
parent971177f751a6e2931232accceab438bce277bde8
Merge commit '971177f751a6e2931232accceab438bce277bde8'

* commit '971177f751a6e2931232accceab438bce277bde8':
  dcadec: scan for extensions in a separate function

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