Merge commit 'd3e4d406b020b0464486318aceda08bd8f69ca41'

[ffmpeg] / libavcodec / qsvdec.c

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 06056a30618ee865e527104b66a33d21ea0286a2..dc9db2fafbd8c3d8fe931679c229dc3fb286cba8 100644 (file)
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -106,7 +106,7 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
             return AVERROR(ENOMEM);
     }
 
-    if (avctx->hwaccel_context) {
+    if (avctx->pix_fmt == AV_PIX_FMT_QSV && avctx->hwaccel_context) {
         AVQSVContext *user_ctx = avctx->hwaccel_context;
         session           = user_ctx->session;
         iopattern         = user_ctx->iopattern;