[FFmpeg-cvslog] qsvenc: Allow use of hw_device_ctx to make the internal session

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sat Mar  4 23:57:37 2017 +0000| [3d197514e613ccd9eab43180c0a7c8b09a307606] | committer: Mark Thompson

qsvenc: Allow use of hw_device_ctx to make the internal session

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d197514e613ccd9eab43180c0a7c8b09a307606
---

 libavcodec/qsvenc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index b2f2b4db71..bd8c24321e 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -693,6 +693,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);