diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-01-28 06:59:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-28 06:59:27 +0300 |
| commit | 862aa2a66bba922fbc4a24cc8a43a16e290e64cf (patch) | |
| tree | 5744da776d2f604d443e89c9ba3538ea46cff535 /source/blender/imbuf | |
| parent | e6a5e33c09b5563405586c5e858534343f376181 (diff) | |
| parent | 93412cb4e75d6999d614ea6a47ec82e12f534cc7 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index e19589317d7..fb8c361d94b 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -53,11 +53,6 @@ typedef struct img_folder { float *rates; } img_fol_t; -enum { - DCP_CINEMA2K = 3, - DCP_CINEMA4K = 4, -}; - static bool check_jp2(const unsigned char *mem, const size_t size) /* J2K_CFMT */ { if (size < sizeof(JP2_HEAD)) { @@ -733,7 +728,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters, parameters->cp_rsiz = OPJ_STD_RSIZ; } else { - parameters->cp_rsiz = DCP_CINEMA2K; + parameters->cp_rsiz = OPJ_CINEMA2K; } break; @@ -754,7 +749,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters, parameters->cp_rsiz = OPJ_STD_RSIZ; } else { - parameters->cp_rsiz = DCP_CINEMA2K; + parameters->cp_rsiz = OPJ_CINEMA4K; } parameters->numpocs = init_4K_poc(parameters->POC, parameters->numresolution); break; |