The branch, master has been updated
via 96065d12612180a57fceee58256de47077f6ec9a (commit)
from 0599d508c90b49bdead385edcec429e2dd50526e (commit)
- Log -----------------------------------------------------------------
commit 96065d12612180a57fceee58256de47077f6ec9a
Author: Niklas Haas <[email protected]>
AuthorDate: Mon Sep 22 17:14:45 2025 +0200
Commit: Niklas Haas <[email protected]>
CommitDate: Thu Sep 25 11:08:37 2025 +0000
avcodec/aom_film_grain: fix AVCOL_*_NB range check
These should also exclude the _NB values themselves.
diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c
index 0f24a2bcf8..bd9647afe9 100644
--- a/libavcodec/aom_film_grain.c
+++ b/libavcodec/aom_film_grain.c
@@ -199,13 +199,13 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params
*s,
fgp->color_trc = get_bits(gb, 8);
fgp->color_space = get_bits(gb, 8);
fgp->color_range = get_bits1(gb) ? AVCOL_RANGE_JPEG :
AVCOL_RANGE_MPEG;
- if (fgp->color_primaries > AVCOL_PRI_NB ||
+ if (fgp->color_primaries >= AVCOL_PRI_NB ||
fgp->color_primaries == AVCOL_PRI_RESERVED ||
fgp->color_primaries == AVCOL_PRI_RESERVED0 ||
- fgp->color_trc > AVCOL_TRC_NB ||
+ fgp->color_trc >= AVCOL_TRC_NB ||
fgp->color_trc == AVCOL_TRC_RESERVED ||
fgp->color_trc == AVCOL_TRC_RESERVED0 ||
- fgp->color_space > AVCOL_SPC_NB ||
+ fgp->color_space >= AVCOL_SPC_NB ||
fgp->color_space == AVCOL_SPC_RESERVED)
goto error;
}
-----------------------------------------------------------------------
Summary of changes:
libavcodec/aom_film_grain.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
