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

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 03:34:04 2015 +0200| [843b860ad974752ef3fe00c75081c3bda3b56a97] | committer: Michael Niedermayer

Merge commit '41a89cba6086de2bd24f9ec7e21200fa162505e9' into release/2.4

* commit '41a89cba6086de2bd24f9ec7e21200fa162505e9':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
	libavcodec/alsdec.c

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

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