RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd' 

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-12 15:41:46 +01:00
parent 9a98ddcf1b ce9d7da765
commit 6e2ca81485
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/qsv.c
View File

@ -187,22 +187,6 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
if (ret < 0) if (ret < 0)
return ret; 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) { if (load_plugins && *load_plugins) {
while (*load_plugins) { while (*load_plugins) {
mfxPluginUID uid; 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, av_log(avctx, AV_LOG_VERBOSE,
"Initialized an internal MFX session using %s implementation\n", "Initialized an internal MFX session using %s implementation\n",
desc); desc);