Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:03:08 +0000 (15:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:03:08 +0000 (15:03 +0200)
* 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@gmx.at>
1  2 
libavcodec/jpeg2000dec.c

Simple merge