diff options
author | James Almer <jamrial@gmail.com> | 2018-04-13 20:34:23 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2018-04-13 20:34:23 -0300 |
commit | f790410b6baa4ee53e8a5796e986de0cae78b073 (patch) | |
tree | dc092d2c1bf35c8eb9888f7b3f77c4720bacf423 /libavfilter/qsvvpp.c | |
parent | ae7e66fb4b1a256fb79a016b9c585de84ac77339 (diff) | |
parent | cca5e4f040971db6de0bfe6968f00c021d8a9c42 (diff) |
Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'
* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42':
qsv: adding Multi Frame Encode support
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/qsvvpp.c')
-rw-r--r-- | libavfilter/qsvvpp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index f32b46dcc0..732cf56a6a 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -515,9 +515,12 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) if (ret != MFX_ERR_NONE) return AVERROR_UNKNOWN; } - ret = MFXJoinSession(device_hwctx->session, s->session); - if (ret != MFX_ERR_NONE) - return AVERROR_UNKNOWN; + + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) { + ret = MFXJoinSession(device_hwctx->session, s->session); + if (ret != MFX_ERR_NONE) + return AVERROR_UNKNOWN; + } if (IS_OPAQUE_MEMORY(s->in_mem_mode) || IS_OPAQUE_MEMORY(s->out_mem_mode)) { s->opaque_alloc.In.Surfaces = s->surface_ptrs_in; |