Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af98
See: 64ea4a0598
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-05 20:32:18 +01:00
commit 777179edb5

Diff Content Not Available