diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-12 15:41:46 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-12 15:41:46 +0100 |
| commit | 6e2ca814857b6a6abf3ced272fb9a259b877de6d (patch) | |
| tree | 7b0c2424af5263b3bfb02d4c65fc519d125dd8d4 | |
| parent | 9a98ddcf1b303729f38e298c441d9975b8b7ee6e (diff) | |
| parent | ce9d7da7650473f580dcce8c9f8550ea532aa6bd (diff) | |
| download | ffmpeg-6e2ca814857b6a6abf3ced272fb9a259b877de6d.tar.gz | |
Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'
* commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd':
qsv: Move down the implementation query
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/qsv.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 4c8e6b01a9..fc22a64351 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); |