[FFmpeg-cvslog] Merge commit 'a73b2c288e3dace6e054a5b48640978be1d5df84' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 01:38:30 2015 +0100| [cda143aaa46fcc1afeff0d01370d0aa2ace961b3] | committer: Michael Niedermayer

Merge commit 'a73b2c288e3dace6e054a5b48640978be1d5df84' into release/2.4

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cda143aaa46fcc1afeff0d01370d0aa2ace961b3
---