diff options
| author | Tim Walker <[email protected]> | 2016-04-01 06:12:31 +0200 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-12-17 07:28:51 -0800 |
| commit | 5b48deb11f450de5d26f37cbe08a6272b6bb1e5b (patch) | |
| tree | d2b464d074fdd35b920ef7d55d731cbad54c52e7 /libhb/qsv_common.c | |
| parent | ac6c1ab005cad9c78bb427aad7be6c9af6d22816 (diff) | |
libhb: fix build with --enable-qsv
Convert qsv_livav.[ch] to be built within libhb.
Convert other files to use qsv_libav.h in place of libavcodec/qsv.h
Don't attempt to build libav with QSV support (not available in unpatched release/11 branch).
QSV-accelerated decoding is broken, so disable it for the time being.
Diffstat (limited to 'libhb/qsv_common.c')
| -rw-r--r-- | libhb/qsv_common.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index bb5dbc15a..2c2d827c6 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -912,9 +912,17 @@ const char* hb_qsv_decode_get_codec_name(enum AVCodecID codec_id) int hb_qsv_decode_is_enabled(hb_job_t *job) { - return ((job != NULL && job->qsv.decode) && - (job->vcodec & HB_VCODEC_QSV_MASK) && - (job->title->video_decode_support & HB_DECODE_SUPPORT_QSV)); + /* + * XXX: we haven't yet adjusted our QSV decoder wrapper to use libav's new + * QSV-accelerated decoder, and our old custom QSV-accelerated decoder + * for libav hasn't been updated to work with newer libav releases, so + * we can't use QSV-accelerated decoding at all for the time being. + * + * return ((job != NULL && job->qsv.decode) && + * (job->vcodec & HB_VCODEC_QSV_MASK) && + * (job->title->video_decode_support & HB_DECODE_SUPPORT_QSV)); + */ + return 0; } int hb_qsv_copyframe_is_slow(int encoder) |