[FFmpeg-devel] [PATCH] avutil/hwcontext_qsv: Fix mixed declaration and code

[FFmpeg-devel] [PATCH] avutil/hwcontext_qsv: Fix mixed declaration and code

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 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
 
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avutil/hwcontext_qsv: Fix mixed declaration and code

[Xiang, Haihao]

On So, 2024-03-24 at 21:30 +0100, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  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
>  

LGTM, 

- Haihao


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".