From 2d3ee7c069d631e8a32b647cb765028ea76b3a2e Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 19 Apr 2024 13:59:40 +0200 Subject: [PATCH] avcodec/hevcdec: Fix precedence, bogus film grain warning Reviewed-by: Niklas Haas Signed-off-by: Andreas Rheinhardt (cherry picked from commit bba996d6cdac15367f265e245987477d0f7b1899) --- libavcodec/hevcdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 5a3d6fc4f1..08fd3be43c 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2897,10 +2897,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;