Merge commit 'a73b2c288e3dace6e054a5b48640978be1d5df84' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:38:30 +0000 (01:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:38:56 +0000 (01:38 +0100)
commitcda143aaa46fcc1afeff0d01370d0aa2ace961b3
treeee4c36e71dfae08554f576928a27ebd8cd6afe68
parent72f83ad277ca93b29c0a76504735e88ab7d7e647
parenta73b2c288e3dace6e054a5b48640978be1d5df84
Merge commit 'a73b2c288e3dace6e054a5b48640978be1d5df84' into release/2.4

* commit 'a73b2c288e3dace6e054a5b48640978be1d5df84':
  adxdec: set avctx->channels in adx_read_header

See: 72f83ad277ca93b29c0a76504735e88ab7d7e647
Merged-by: Michael Niedermayer <michaelni@gmx.at>