Changeset b0448e51 in ffmpeg

Timestamp:

Jul 3, 2013, 10:02:11 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

26f6acc6

Parents:

3f03643 (diff), be327100 (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.

Message:

Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

• commit 'be3271009ef893fbed9640e8edbd771685fd957b': jpeg2000: Define the maximum decomposition levels

Conflicts:

libavcodec/jpeg2000.h

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

(No files)