Changeset e96c8015 in ffmpeg

Timestamp:

Oct 10, 2013, 8:32:04 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c589c4c5

Parents:

5a7a902a (diff), 1018a922 (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> (10/10/13 07:55:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/10/13 08:32:04)

Message:

Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'

• commit '1018a92219a38a812cf97761c6b3a5e66a400f4b': jpeg2000: Check block length

See: 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2
See: 582f53349eabd75164d4389503eb95048982cfdc
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)