[FFmpeg-cvslog] Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 12:02:11 2013 +0200| [b0448e51235760b6ba8e9562c1233e43e818a1f7] | committer: Michael Niedermayer

Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

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

Conflicts:
	libavcodec/jpeg2000.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0448e51235760b6ba8e9562c1233e43e818a1f7
---