Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:42:20 +0000 (16:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:42:33 +0000 (16:42 +0200)
commit13f86baa1d98c89e6ac176f182e7a1ebc7c260b7
treeb8b6f4cb78a37fb373c3fc5b2b402297298e9a3e
parent5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca
parent95a57d26d8653d21f0dab1aff3558ee944853dbf
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>