projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8d03fe 05b3afd)
Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Sun, 18 Oct 2015 01:23:38 +0000 (03:23 +0200)
committermayeut <mayeut@users.noreply.github.com>
Sun, 18 Oct 2015 01:23:38 +0000 (03:23 +0200)
1  2 
src/lib/openjp2/j2k.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/openjp2/j2k.c
Simple merge
Fork of openjpeg with some changes used by DCP-o-matic.