avcodec/hevcdec: Fix precedence, bogus film grain warning

Reviewed-by: Niklas Haas <ffmpeg@haasn.xyz>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.1
Andreas Rheinhardt 10 months ago
parent f18de5bc4a
commit bba996d6cd
  1. 8
      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;

Loading…
Cancel
Save