From ade89bc6defb0c8996088d59ab0c8eb437156da5 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Mon, 9 Jan 2023 20:50:04 +0800 Subject: [PATCH] avcodec/videotoolbox: prefer hw_frames_ctx/hw_device_ctx over hwaccel_context Signed-off-by: Zhao Zhili --- libavcodec/videotoolbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a18b49007d..acf0c79822 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1181,7 +1181,8 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) vtctx->logctx = avctx; - if (avctx->hwaccel_context) + if (!avctx->hw_frames_ctx && !avctx->hw_device_ctx && + avctx->hwaccel_context) return videotoolbox_start(avctx); if (!avctx->hw_frames_ctx && !avctx->hw_device_ctx) {