Merge commit '777885983533235ccda5145f96317fc8cd0a18ab'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:21:07 +0000 (11:21 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:21:07 +0000 (11:21 +0200)
commit04eff96822252321bfb32697fbc5456ef488192f
treeea859fbde0310b8128cfd7caa314073d1d1d901c
parentecaa6cf7b84ad03114b1240ea26491762b6e256f
parent777885983533235ccda5145f96317fc8cd0a18ab
Merge commit '777885983533235ccda5145f96317fc8cd0a18ab'

* commit '777885983533235ccda5145f96317fc8cd0a18ab':
  dcadec: set channel layout in a separate function

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