[FFmpeg-cvslog] Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Apr 12 15:41:46 2016 +0100| [6e2ca814857b6a6abf3ced272fb9a259b877de6d] | committer: Derek Buitenhuis

Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'

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

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

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

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

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 4c8e6b0..fc22a64 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -187,22 +187,6 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
     if (ret < 0)
         return 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";
-    }
-
     if (load_plugins && *load_plugins) {
         while (*load_plugins) {
             mfxPluginUID uid;
@@ -242,6 +226,22 @@ load_plugin_fail:
         }
     }
 
+    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);


======================================================================

diff --cc libavcodec/qsv.c
index 4c8e6b0,3e892e8..fc22a64
--- a/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);
      }
  
 +    ret = ff_qsv_set_display_handle(avctx, qs);
 +    if (ret < 0)
 +        return 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";
-     }
- 
      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);