[FFmpeg-cvslog] Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 16:36:05 2013 +0200| [5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca
---