| Message ID | GV1P250MB07371AC4FEB34B050AAB7EBF8F372@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 1f1b773859a6f1491b1fa9f310a97ee038755263 |
| Headers | show |
| Series | [FFmpeg-devel] avutil/hwcontext_qsv: Fix mixed declaration and code | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
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
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
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)