Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Jul 2013 10:22:17 +0000 (12:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Jul 2013 10:22:22 +0000 (12:22 +0200)
* qatar/master:
  jpeg2000: Initialize only once mqc arrays

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

Trivial merge