Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)
commitb0448e51235760b6ba8e9562c1233e43e818a1f7
treea4bc536758c6b1e68f195978c1b752bdbdfc4613
parent3f0364327c32175221104799958702458be8fbd6
parentbe3271009ef893fbed9640e8edbd771685fd957b
Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

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

Conflicts:
libavcodec/jpeg2000.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c