Changeset 4aa48e46 in ffmpeg

Timestamp:

Mar 9, 2014, 9:29:17 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7a69ffaf

Parents:

0cf6b3b5 (diff), fb0a988f (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> (03/09/14 21:28:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/09/14 21:29:17)

Message:

Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'

• commit 'fb0a988f94c3b8907610172295a7f6bf78c57105': riff: IPJ2 decodes with JPEG2000 decoder

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

(No files)