Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 09:41:57 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 09:44:23 +0000 (11:44 +0200)
* commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c':
  jpeg2000: Remove unused passes array in Jpeg200Cblk structure

The array is left as its used by our encoder

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

Trivial merge