Changeset ff849e11 in ffmpeg

Timestamp:

May 5, 2015, 8:56:11 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1ace789f

Parents:

9810aa3 (diff), 94bb1ce8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/05/15 20:55:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/05/15 20:56:11)

Message:

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>

(No files)