Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

Browse Source

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

Conflicts:
	libavcodec/alsdec.c

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

...

This commit is contained in:

Michael Niedermayer 2015-05-05 22:55:45 +02:00

parent 9810aa3408 94bb1ce882

commit ff849e11e3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available