summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2017-01-06 20:43:05 +0000
committersr55 <[email protected]>2017-01-06 20:43:05 +0000
commit610d4b38d0c86ad36fd7a8d66a69ea64b01afdb3 (patch)
tree1dae8b4e208a5e8be3c8a023801a8a7cf4d6da71
parent62f25f927c61969deb6a063448b9fb2c2295391a (diff)
qsv: Fix a crash that can occur in hb_qsv_info_print() when QSV hardware exists in the system but is disabled in the bios.
-rw-r--r--libhb/qsv_common.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index 8042b50b4..3d8e7a275 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -769,21 +769,23 @@ void hb_qsv_info_print()
hb_log("Intel Quick Sync Video support: %s",
hb_qsv_available() ? "yes": "no");
- // also print the details
- if (qsv_hardware_version.Version)
- {
- hb_log(" - Intel Media SDK hardware: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
- qsv_hardware_version.Major, qsv_hardware_version.Minor,
- HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
- }
- if (qsv_software_version.Version)
- {
- hb_log(" - Intel Media SDK software: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
- qsv_software_version.Major, qsv_software_version.Minor,
- HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
- }
if (hb_qsv_available())
{
+ // also print the details
+ if (qsv_hardware_version.Version)
+ {
+ hb_log(" - Intel Media SDK hardware: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ qsv_hardware_version.Major, qsv_hardware_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
+
+ if (qsv_software_version.Version)
+ {
+ hb_log(" - Intel Media SDK software: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ qsv_software_version.Major, qsv_software_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
+
if (hb_qsv_info_avc != NULL && hb_qsv_info_avc->available)
{
hb_log(" - H.264 encoder: yes");