Merge commit 'db13e02c6f0355fabd540e77b61ade127d6411ff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:38:45 +0000 (15:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:38:55 +0000 (15:38 +0200)
commit44741113257b8f5e21f4676894d3ff9b9e5f99ac
treeb36393eb4db949bbda12bbee44e093d2fdbc73ad
parent2328e7e865216acdad6c9ce8a8dae4664aff3a29
parentdb13e02c6f0355fabd540e77b61ade127d6411ff
Merge commit 'db13e02c6f0355fabd540e77b61ade127d6411ff'

* commit 'db13e02c6f0355fabd540e77b61ade127d6411ff':
  jpeg2000: Compute corrections of sub-band coordinates
  jpeg2000: Remove unneeded variable initialization

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