diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:36:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:36:05 +0200 |
commit | 5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca (patch) | |
tree | b8b6f4cb78a37fb373c3fc5b2b402297298e9a3e /presets/libx264-ipod320.ffpreset | |
parent | 19ff6f55e800d848920af4a10e9516e51bfdcb0f (diff) | |
parent | 22e18ea39e371030cc78973d1b46aae45a7ea215 (diff) | |
download | ffmpeg-5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca.tar.gz |
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>
Diffstat (limited to 'presets/libx264-ipod320.ffpreset')
0 files changed, 0 insertions, 0 deletions