[FFmpeg-cvslog] Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 11:41:57 2013 +0200| [b24e8f566d0ccf281605b31e93f847ccb3b1544b] | committer: Michael Niedermayer

Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'

* 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 at gmx.at>

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