Changeset 37cf695a in ffmpeg

Timestamp:

Jun 6, 2014, 9:42:54 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5265e3e4

Parents:

faabef3d (diff), 3d79d0c9 (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> (06/06/14 21:42:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/06/14 21:42:54)

Message:

Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'

• commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba': adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

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

(No files)