diff mbox

[FFmpeg-devel,12/24] qsvenc: Allow use of hw_device_ctx to make the internal session

Message ID 20170612224041.6750-13-sw@jkqxz.net
State Accepted
Commit 3d197514e613ccd9eab43180c0a7c8b09a307606
Headers show

Commit Message

Mark Thompson June 12, 2017, 10:40 p.m. UTC 
(cherry picked from commit 3d197514e613ccd9eab43180c0a7c8b09a307606)
---
 libavcodec/qsvenc.c | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 64227cea6e..5eb506fb76 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -700,6 +700,13 @@  static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q)
         }
 
         q->session = q->internal_session;
+    } else if (avctx->hw_device_ctx) {
+        ret = ff_qsv_init_session_device(avctx, &q->internal_session,
+                                         avctx->hw_device_ctx, q->load_plugins);
+        if (ret < 0)
+            return ret;
+
+        q->session = q->internal_session;
     } else {
         ret = ff_qsv_init_internal_session(avctx, &q->internal_session,
                                            q->load_plugins);