ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Aug 25 18:00:14 2021 -0300| [9677053884066f07821bba57a4eb0436cfec0905] | committer: James Almer
avcodec/h264_slice: don't allocate film grain buffers when using hwaccel Fixes regression since 66845cffc3bbb17f91294d15cd6f57f3df3bce97 Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9677053884066f07821bba57a4eb0436cfec0905 --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
