summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorScott <[email protected]>2017-01-11 19:34:19 +0000
committerGitHub <[email protected]>2017-01-11 19:34:19 +0000
commitffe394b2dba73758eae564ae959c6e94b8dce331 (patch)
tree514caf57d7ab27894ccca0e58a68041e4ef36c4e /libhb
parentfbea656ef0a79757e77ecfa313bc009e21b28993 (diff)
json: Decoding JSON now checks if QSV is available before setting QSV… (#509)
json: Decoding JSON now checks if QSV is available before setting QSV… #509
Diffstat (limited to 'libhb')
-rw-r--r--libhb/hb_json.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index 5321d31a1..296cd9d24 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -11,6 +11,7 @@
#include "hb.h"
#include "hb_json.h"
#include "libavutil/base64.h"
+#include "qsv_common.h"
/**
* Convert an hb_state_t to a jansson dict
@@ -918,6 +919,9 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
hb_error("hb_dict_to_job: failed to parse dict: %s", error.text);
goto fail;
}
+
+ // Make sure QSV Decode is only True if the hardware is available.
+ job->qsv.decode = job->qsv.decode && hb_qsv_available();
// Lookup mux id
if (hb_value_type(mux) == HB_VALUE_TYPE_STRING)