Merge pull request #2547 from nmschulte/dev

ffmpeg: force-disable zerocopy for RPi OMX patch
This commit is contained in:
Calin Crisan 2020-10-24 20:07:46 +03:00 committed by GitHub
commit b2182bbe4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -0,0 +1,15 @@
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 19b4f33836..4641dc79e2 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -644,6 +644,10 @@ static av_cold int omx_encode_init(AVCodecContext *avctx)
OMX_BUFFERHEADERTYPE *buffer;
OMX_ERRORTYPE err;
+#if CONFIG_OMX_RPI
+ s->input_zerocopy = 0;
+#endif
+
s->omx_context = omx_init(avctx, s->libname, s->libprefix);
if (!s->omx_context)
return AVERROR_ENCODER_NOT_FOUND;