Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 11:18:53 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 11:18:58 +0000 (12:18 +0100)
commit4d60e5051e66c6e79645efec1376b98caf41ad03
treecd3cac5dce89799a1f1f0254ba33f73ff35167d0
parent8c0a14d221af1add009829d65a5beb0e5d5d8770
parentfaf340f60c18c0af282570eed156ec67c1d98f6f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkaudio: set channel layout

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