Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2021-08-26 00:00:14 +0300
committerJames Almer <jamrial@gmail.com>2021-08-26 00:01:00 +0300
commit9677053884066f07821bba57a4eb0436cfec0905 (patch)
tree00499211ac79861aca6b6be7b88d82f041c08e94 /libavcodec/h264_slice.c
parent8cbed82b2aaebe98ac4f89555eab17e5e21d9f51 (diff)
avcodec/h264_slice: don't allocate film grain buffers when using hwaccel
Fixes regression since 66845cffc3bbb17f91294d15cd6f57f3df3bce97 Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r--libavcodec/h264_slice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 3063ee069a..201b22455c 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -527,7 +527,7 @@ static int h264_frame_start(H264Context *h)
pic->f->crop_top = h->crop_top;
pic->f->crop_bottom = h->crop_bottom;
- pic->needs_fg = h->sei.film_grain_characteristics.present &&
+ pic->needs_fg = h->sei.film_grain_characteristics.present && !h->avctx->hwaccel &&
!(h->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN);
if ((ret = alloc_picture(h, pic)) < 0)