From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 14 Jul 2013 09:41:57 +0000 (+0200)
Subject: Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'
X-Git-Tag: android-x86-4.4-r1~2351
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b24e8f566d0ccf281605b31e93f847ccb3b1544b;p=android-x86%2Fexternal-ffmpeg.git

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

b24e8f566d0ccf281605b31e93f847ccb3b1544b