har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/hevcdec: Fix precedence, bogus film grain warning

Browse Source 
Reviewed-by: Niklas Haas <ffmpeg@haasn.xyz>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit bba996d6cdac15367f265e245987477d0f7b1899)
This commit is contained in:
Andreas Rheinhardt 2024-04-19 13:59:40 +02:00 committed by Jan Ekström
parent 30002d58fa
commit 2d3ee7c069
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/hevcdec.c
View File

@ -2897,10 +2897,10 @@ static int hevc_frame_start(HEVCContext *s)
goto fail; goto fail;
if (s->ref->needs_fg && if (s->ref->needs_fg &&
( s->sei.common.film_grain_characteristics.present && (s->sei.common.film_grain_characteristics.present &&
!ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id,
s->ref->frame->format)) s->ref->frame->format)
|| !av_film_grain_params_select(s->ref->frame)) { || !av_film_grain_params_select(s->ref->frame))) {
av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown,
"Unsupported film grain parameters. Ignoring film grain.\n"); "Unsupported film grain parameters. Ignoring film grain.\n");
s->ref->needs_fg = 0; s->ref->needs_fg = 0;