Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-28 06:50:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-28 06:50:46 +0300
commit93412cb4e75d6999d614ea6a47ec82e12f534cc7 (patch)
treef2e8f03098a63767fcf61b3461234045398ff83c /source/blender/imbuf
parent87d3f4aff3225104cbb8be41ac0339c6a1cd9a85 (diff)
Fix jpeg200 4k cinema preset
Used the wrong define, also remove local defines.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/jp2.c9
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;