Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 22:15:35 +0000 (23:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 23:18:42 +0000 (00:18 +0100)
commitcb751a6a96475f525d9933a55ad2b88c1ec92fa1
tree3a46c24e30281730c41c5f7de0471f86ece2d325
parentd1daa71f9d22756fa5bd6690e9f5fc31c94b1490
parent89de5157b1cbe7807d3ec1d51bd56a75e98c002e
Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'

* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
  dcadec: implement request_channel_layout.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c