From 1f1b773859a6f1491b1fa9f310a97ee038755263 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 24 Mar 2024 21:29:44 +0100 Subject: [PATCH] avutil/hwcontext_qsv: Fix mixed declaration and code Reviewed-by: Xiang, Haihao Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index e5e043d2d1..c7c7878644 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1121,7 +1121,8 @@ fail: static int qsv_init_internal_session(AVHWFramesContext *ctx, mfxSession *session, int upload) { - AVQSVFramesContext *frames_hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *frames_hwctx = &s->p; QSVDeviceContext *device_priv = ctx->device_ctx->hwctx; AVQSVDeviceContext *hwctx = &device_priv->p; int opaque = 0; @@ -1153,7 +1154,6 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, } #if QSV_HAVE_OPAQUE - QSVFramesContext *s = ctx->hwctx; opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME); #endif