Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'
* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838': alsdec: check sample pointer range in revert_channel_correlation Conflicts: libavcodec/alsdec.c See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ff849e11e3