Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:32:18 +0000 (20:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:36:06 +0000 (20:36 +0100)
* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge