summaryrefslogtreecommitdiffstats
path: root/libhb/enc_qsv.c
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-09-11 19:09:22 -0700
committerJohn Stebbins <[email protected]>2019-09-12 10:25:54 -0700
commit0279a5584ad3644ec3bcca98f0b1b7fb547dd2a1 (patch)
tree67cef6fbf13778cee7e5f077470ae178f4e60de8 /libhb/enc_qsv.c
parent8a354a757bafb792b5189367e29cbda9a193f2b6 (diff)
libhb: make hb_buffer_t libhb private
hb_buffer_t conflicts with a harfbuzz typedef by the same name
Diffstat (limited to 'libhb/enc_qsv.c')
-rw-r--r--libhb/enc_qsv.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index 750bd35f2..511f3af24 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -32,6 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "handbrake/handbrake.h"
#include "handbrake/nal_units.h"
+#include "handbrake/hbffmpeg.h"
#include "handbrake/qsv_common.h"
#include "handbrake/qsv_memory.h"
#include "handbrake/h264_common.h"
@@ -775,22 +776,9 @@ int qsv_enc_init(hb_work_private_t *pv)
else
{
mfxStatus err;
- //qsv->mfx_session = pv->mfx_session;
- AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx.hw_frames_ctx->data;
- AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
mfxVersion ver;
mfxIMPL impl;
- mfxHDL handle = NULL;
- mfxHandleType handle_type;
-
- static const mfxHandleType handle_types[] = {
- MFX_HANDLE_VA_DISPLAY,
- MFX_HANDLE_D3D9_DEVICE_MANAGER,
- MFX_HANDLE_D3D11_DEVICE,
- };
-
- int i;
AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)hb_hw_device_ctx->data;
AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;