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 /libavcodec/qsv.c | |
| parent | ae7e66fb4b1a256fb79a016b9c585de84ac77339 (diff) | |
| parent | cca5e4f040971db6de0bfe6968f00c021d8a9c42 (diff) | |
| download | ffmpeg-f790410b6baa4ee53e8a5796e986de0cae78b073.tar.gz | |
Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'
* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42':
qsv: adding Multi Frame Encode support
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsv.c')
| -rw-r--r-- | libavcodec/qsv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 6d1fbde452..45e1c25c68 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -617,10 +617,12 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, "Error setting a HW handle"); } - err = MFXJoinSession(parent_session, session); - if (err != MFX_ERR_NONE) - return ff_qsv_print_error(avctx, err, - "Error joining session"); + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) { + err = MFXJoinSession(parent_session, session); + if (err != MFX_ERR_NONE) + return ff_qsv_print_error(avctx, err, + "Error joining session"); + } ret = qsv_load_plugins(session, load_plugins, avctx); if (ret < 0) { |