[FFmpeg-cvslog] Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 15:03:08 2013 +0200| [c7a092cb2d573535dbc26e93a1664f3db39df47c] | committer: Michael Niedermayer

Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'

* commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9':
  jpeg2000: Fix compute precedence error in lut_gain index
  jpeg2000: Initialize code blocks structures in precincts to 0
  jpeg2000: Check that we have enough components for MCT

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

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

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