The branch, master has been updated
via baace56169a8cea7b44d727bdf656110aace011d (commit)
via f0586ffa95127b3370850e3981f48c7057bd2ab8 (commit)
from 188440929d3fdc7ae40b119acbc151054afce53f (commit)
- Log -----------------------------------------------------------------
commit baace56169a8cea7b44d727bdf656110aace011d
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Mon Sep 22 15:00:32 2025 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Fri Sep 26 06:00:43 2025 +0200
avfilter/vf_tonemap_opencl: Make array smaller
Also makes the code more independent of AVCOL_TRC_NB.
Reviewed-by: Niklas Haas <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c
index 26fc02923c..2c1b0a007d 100644
--- a/libavfilter/vf_tonemap_opencl.c
+++ b/libavfilter/vf_tonemap_opencl.c
@@ -70,12 +70,12 @@ typedef struct TonemapOpenCLContext {
cl_mem util_mem;
} TonemapOpenCLContext;
-static const char *const linearize_funcs[AVCOL_TRC_NB] = {
+static const char *const linearize_funcs[] = {
[AVCOL_TRC_SMPTE2084] = "eotf_st2084",
[AVCOL_TRC_ARIB_STD_B67] = "inverse_oetf_hlg",
};
-static const char *const delinearize_funcs[AVCOL_TRC_NB] = {
+static const char *const delinearize_funcs[] = {
[AVCOL_TRC_BT709] = "inverse_eotf_bt1886",
[AVCOL_TRC_BT2020_10] = "inverse_eotf_bt1886",
};
commit f0586ffa95127b3370850e3981f48c7057bd2ab8
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Mon Sep 22 14:40:24 2025 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Fri Sep 26 06:00:14 2025 +0200
avfilter/vf_colorspace: Make array smaller
Also makes it more independent of AVCOL_TRC_NB.
Reviewed-by: Niklas Haas <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index f919350d65..52e84abbe1 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -171,7 +171,7 @@ typedef struct ColorSpaceContext {
// FIXME I'm pretty sure gamma22/28 also have a linear toe slope, but I can't
// find any actual tables that document their real values...
// See http://www.13thmonkey.org/~boris/gammacorrection/ first graph why it
matters
-static const struct TransferCharacteristics
transfer_characteristics[AVCOL_TRC_NB] = {
+static const struct TransferCharacteristics transfer_characteristics[] = {
[AVCOL_TRC_BT709] = { 1.099, 0.018, 0.45, 4.5 },
[AVCOL_TRC_GAMMA22] = { 1.0, 0.0, 1.0 / 2.2, 0.0 },
[AVCOL_TRC_GAMMA28] = { 1.0, 0.0, 1.0 / 2.8, 0.0 },
@@ -189,7 +189,7 @@ static const struct TransferCharacteristics *
{
const struct TransferCharacteristics *coeffs;
- if (trc >= AVCOL_TRC_NB)
+ if ((unsigned)trc >= FF_ARRAY_ELEMS(transfer_characteristics))
return NULL;
coeffs = &transfer_characteristics[trc];
if (!coeffs->alpha)
-----------------------------------------------------------------------
Summary of changes:
libavfilter/vf_colorspace.c | 4 ++--
libavfilter/vf_tonemap_opencl.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
