mirror of https://git.ffmpeg.org/ffmpeg.git
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:
commit
777179edb5