Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:55:45 +0000 (22:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:56:11 +0000 (22:56 +0200)
* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
libavcodec/alsdec.c

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

Trivial merge