[FFmpeg-cvslog] Merge commit '971177f751a6e2931232accceab438bce277bde8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Sep 17 11:08:22 2015 +0200| [ecaa6cf7b84ad03114b1240ea26491762b6e256f] | committer: Hendrik Leppkes

Merge commit '971177f751a6e2931232accceab438bce277bde8'

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

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

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