diff options
| author | James Almer <jamrial@gmail.com> | 2021-09-14 09:47:32 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-09-14 13:55:49 -0300 |
| commit | 5d5ab3b4e68109f216467866d193182eb8e41386 (patch) | |
| tree | ca7d50a440f9425042a9d9a02401c160146dec8c /libavcodec/h264_picture.c | |
| parent | e67deaf86cb1a79054c4f6dcfcaab9b2c60eb8a4 (diff) | |
avcodec/h264_picture: wait for the second slice to apply film grain on interlaced content
Fixes: Assertion failure
Fixes: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6581961297100800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 5944798394..66fd9bc4cb 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -250,7 +250,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) if (err < 0) av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); - } else if (!in_setup && cur->needs_fg) { + } else if (!in_setup && cur->needs_fg && (!FIELD_PICTURE(h) || !h->first_field)) { AVFrameSideData *sd = av_frame_get_side_data(cur->f, AV_FRAME_DATA_FILM_GRAIN_PARAMS); av_assert0(sd); // always present if `cur->needs_fg` err = ff_h274_apply_film_grain(cur->f_grain, cur->f, &h->h274db, |