Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'

* commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd':
  qsv: Move down the implementation query

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/qsv.c
index 4c8e6b01a99ed477d5127313c5ce243215ef9b83,3e892e853ce55315961d1a27f68be444757f48bb..fc22a64351a31c1578846a882d72776957566546
--- 1/libavcodec/qsv.c
--- 2/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@@ -183,26 -101,6 +183,10 @@@ int ff_qsv_init_internal_session(AVCode
          return ff_qsv_error(ret);
      }
  
-     MFXQueryIMPL(qs->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";
-     }
- 
 +    ret = ff_qsv_set_display_handle(avctx, qs);
 +    if (ret < 0)
 +        return ret;
 +
      if (load_plugins && *load_plugins) {
          while (*load_plugins) {
              mfxPluginUID uid;
@@@ -242,6 -140,22 +226,22 @@@ load_plugin_fail
          }
      }
  
 -    MFXQueryIMPL(*session, &impl);
++    MFXQueryIMPL(qs->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);