Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)
commit5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca
treeb8b6f4cb78a37fb373c3fc5b2b402297298e9a3e
parent19ff6f55e800d848920af4a10e9516e51bfdcb0f
parent22e18ea39e371030cc78973d1b46aae45a7ea215
Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'

* commit '22e18ea39e371030cc78973d1b46aae45a7ea215':
  jpeg2000: Optimize output sample conversion
  jpeg2000: Reset s->numX/Ytiles on tile deallocation
  jpeg2000: Optimize dequantization
  jpeg2000: Do not assume a single tile
  jpeg2000: Speed up jpeg2000_decode_tile()
  jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c