[FFmpeg-cvslog] qsv: Move down the implementation query

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Wed Feb 24 15:13:58 2016 +0100| [ce9d7da7650473f580dcce8c9f8550ea532aa6bd] | committer: Luca Barbato

qsv: Move down the implementation query

The plugin loaded may not match the general implementation capability
wise.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce9d7da7650473f580dcce8c9f8550ea532aa6bd
---

 libavcodec/qsv.c |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index ee6b262..3e892e8 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -101,22 +101,6 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session,
         return ff_qsv_error(ret);
     }
 
-    MFXQueryIMPL(*session, &impl);
-
-    switch (MFX_IMPL_BASETYPE(impl)) {
-    case MFX_IMPL_SOFTWARE:
-        desc = "software";
-        break;
-    case MFX_IMPL_HARDWARE:
-    case MFX_IMPL_HARDWARE2:
-    case MFX_IMPL_HARDWARE3:
-    case MFX_IMPL_HARDWARE4:
-        desc = "hardware accelerated";
-        break;
-    default:
-        desc = "unknown";
-    }
-
     if (load_plugins && *load_plugins) {
         while (*load_plugins) {
             mfxPluginUID uid;
@@ -156,6 +140,22 @@ load_plugin_fail:
         }
     }
 
+    MFXQueryIMPL(*session, &impl);
+
+    switch (MFX_IMPL_BASETYPE(impl)) {
+    case MFX_IMPL_SOFTWARE:
+        desc = "software";
+        break;
+    case MFX_IMPL_HARDWARE:
+    case MFX_IMPL_HARDWARE2:
+    case MFX_IMPL_HARDWARE3:
+    case MFX_IMPL_HARDWARE4:
+        desc = "hardware accelerated";
+        break;
+    default:
+        desc = "unknown";
+    }
+
     av_log(avctx, AV_LOG_VERBOSE,
            "Initialized an internal MFX session using %s implementation\n",
            desc);