projects / openjpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab22c5b ef01f18)
Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizatio... 786/head
authorEven Rouault <even.rouault@spatialys.com>
Thu, 8 Sep 2016 08:30:09 +0000 (10:30 +0200)
committerEven Rouault <even.rouault@spatialys.com>
Thu, 8 Sep 2016 08:30:09 +0000 (10:30 +0200)
commit48c16b2c199210a3c20b306a737eac5fc2c8f6c9
tree35cefb1c82b55cc19cfac9ef04db410565338b5atree | snapshot
parentab22c5bad55fccdc440847c896baaf4bf89365a0commit | diff
parentef01f18dfc6780b776d0674ed3e7415c6ef54d24commit | diff
Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizations_multithreading_2

Conflicts:
src/lib/openjp2/t1.c
.travis.yml diff1 | diff2 | blob | history
src/lib/openjp2/dwt.c diff1 | diff2 | blob | history
src/lib/openjp2/dwt.h diff1 | diff2 | blob | history
src/lib/openjp2/j2k.c diff1 | diff2 | blob | history
src/lib/openjp2/jp2.c diff1 | diff2 | blob | history
src/lib/openjp2/opj_includes.h diff1 | diff2 | blob | history
src/lib/openjp2/t1.c diff1 | diff2 | blob | history
src/lib/openjp2/tcd.c diff1 | diff2 | blob | history
Fork of openjpeg with some changes used by DCP-o-matic.