Merge remote-tracking branch 'qatar/master'

* qatar/master:
  jpeg2000: Use the matching coding style struct for transform selection
  jpeg2000: Merge rescaling with interleaving in 9/7 IDWT

No change, all commits & hunks where already in.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/26/merge
Michael Niedermayer 12 years ago
commit 13f86baa1d

Diff Content Not Available