Merge pull request #551 from mayeut/coc-qcc
authorMatthieu Darbois <mayeut@users.noreply.github.com>
Sun, 10 Jan 2016 23:23:44 +0000 (00:23 +0100)
committerMatthieu Darbois <mayeut@users.noreply.github.com>
Sun, 10 Jan 2016 23:23:44 +0000 (00:23 +0100)
Add COC/QCC in main header when needed

1  2 
src/lib/openjp2/j2k.c

Simple merge