Commit ff849e11 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '94bb1ce8'

* commit '94bb1ce8':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
	libavcodec/alsdec.c

See: afc7748dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9810aa34 94bb1ce8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment