Merge branch 'master' into htj2c 20/head
authorJohn Hurst <jhurst@cinecert.com>
Mon, 30 Dec 2019 22:03:32 +0000 (14:03 -0800)
committerGitHub <noreply@github.com>
Mon, 30 Dec 2019 22:03:32 +0000 (14:03 -0800)
commit39d533e10e9f5248c557caa0777c8c10ed5d737c
tree6e03793692f45418ea89c55edcb95ce89d9aad5b
parent5dd260660cfa14ece62365139962dfb4cbbafb10
parenta67f55782d4758355190fe3f14ac6159b9d79e1e
Merge branch 'master' into htj2c
src/JP2K_Sequence_Parser.cpp
src/KM_util.h
src/MDD.cpp
src/MDD.h
src/Metadata.cpp
src/Metadata.h