Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'

[ffmpeg] / libavcodec / qsv.c

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 6d1fbde452ae0bb77fe57a7fbd443e234852b096..45e1c25c68f69daf862f6cd75c5a592b86dbfced 100644 (file)
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -617,10 +617,12 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
                                       "Error setting a HW handle");
     }
 
-    err = MFXJoinSession(parent_session, session);
-    if (err != MFX_ERR_NONE)
-        return ff_qsv_print_error(avctx, err,
-                                  "Error joining session");
+    if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) {
+        err = MFXJoinSession(parent_session, session);
+        if (err != MFX_ERR_NONE)
+            return ff_qsv_print_error(avctx, err,
+                                      "Error joining session");
+    }
 
     ret = qsv_load_plugins(session, load_plugins, avctx);
     if (ret < 0) {