Commit aabe5257 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'e328178d'

* commit 'e328178d':
  qsvdec: only access hwaccel_context is the pixel format is QSV
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents e887d685 e328178d
...@@ -106,7 +106,7 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q) ...@@ -106,7 +106,7 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (avctx->hwaccel_context) { if (avctx->pix_fmt == AV_PIX_FMT_QSV && avctx->hwaccel_context) {
AVQSVContext *user_ctx = avctx->hwaccel_context; AVQSVContext *user_ctx = avctx->hwaccel_context;
session = user_ctx->session; session = user_ctx->session;
iopattern = user_ctx->iopattern; iopattern = user_ctx->iopattern;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment