Use 1 guard bit in JPEG2000 encoding for 2K, per Bv2.1.

2 files changed, 2 insertions, 1 deletions

diff --git a/cscript b/cscript
index 89ecb5fd..89ebe5a2 100644
--- a/cscript
+++ b/cscript
@@ -41,7 +41,7 @@ def dependencies(target, options):
     if options['jpeg'] == 'oj1':
         return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'bb09615'))
     else:
-        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'bb09615'))
+        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'bb09615'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
diff --git a/src/j2k_transcode.cc b/src/j2k_transcode.cc
index b9ebe6c3..dafe8fdf 100644
--- a/src/j2k_transcode.cc
+++ b/src/j2k_transcode.cc
@@ -308,6 +308,7 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
 	parameters.max_comp_size = parameters.max_cs_size / 1.25;
 	parameters.tcp_numlayers = 1;
 	parameters.tcp_mct = 1;
+	parameters.numgbits = fourk ? 2 : 1;
 
 	/* Setup the encoder parameters using the current image and user parameters */
 	opj_setup_encoder (encoder, &parameters, xyz->opj_image());