Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 11:59:43 +0000 (12:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 12:02:20 +0000 (13:02 +0100)
commit30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb
tree4ffadd54bd430504743bcb6893977fd977e815de
parent551a679795629ece44dc01efbb340bc59e015459
parent35686a289fcd2f9d7502e45002f168a753b11f9c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3adu: Set the channel layout properly

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