aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-04-19 13:59:40 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-04-19 17:44:21 +0200
commitbba996d6cdac15367f265e245987477d0f7b1899 (patch)
tree0ede4fd211eea1c98b7fe953e8a6ba842f0ac478
parentf18de5bc4a5721d630449c6dae4bbeebe36d2a82 (diff)
downloadffmpeg-bba996d6cdac15367f265e245987477d0f7b1899.tar.gz
avcodec/hevcdec: Fix precedence, bogus film grain warning
Reviewed-by: Niklas Haas <ffmpeg@haasn.xyz> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/hevcdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index a2c967cf09..1974bf9cb3 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -2898,10 +2898,10 @@ static int hevc_frame_start(HEVCContext *s)
goto fail;
if (s->ref->needs_fg &&
- ( s->sei.common.film_grain_characteristics.present &&
- !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id,
- s->ref->frame->format))
- || !av_film_grain_params_select(s->ref->frame)) {
+ (s->sei.common.film_grain_characteristics.present &&
+ !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id,
+ s->ref->frame->format)
+ || !av_film_grain_params_select(s->ref->frame))) {
av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown,
"Unsupported film grain parameters. Ignoring film grain.\n");
s->ref->needs_fg = 0;