avformat/hlsenc: deprecate hls_wrap option

[ffmpeg] / ffmpeg_qsv.c

diff --git a/ffmpeg_qsv.c b/ffmpeg_qsv.c
index 68ff5bd5dc14139d6a1c60f32d268cf041840c01..86824b60f20d09845dd785417c05850fe960e386 100644 (file)
--- a/ffmpeg_qsv.c
+++ b/ffmpeg_qsv.c
@@ -28,6 +28,8 @@
 
 #include "ffmpeg.h"
 
+char *qsv_device = NULL;
+
 static int qsv_get_buffer(AVCodecContext *s, AVFrame *frame, int flags)
 {
     InputStream *ist = s->opaque;
@@ -44,15 +46,26 @@ static void qsv_uninit(AVCodecContext *s)
 static int qsv_device_init(InputStream *ist)
 {
     int err;
+    AVDictionary *dict = NULL;
+
+    if (qsv_device) {
+        err = av_dict_set(&dict, "child_device", qsv_device, 0);
+        if (err < 0)
+            return err;
+    }
 
     err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_QSV,
-                                 ist->hwaccel_device, NULL, 0);
+                                 ist->hwaccel_device, dict, 0);
     if (err < 0) {
         av_log(NULL, AV_LOG_ERROR, "Error creating a QSV device\n");
-        return err;
+        goto err_out;
     }
 
-    return 0;
+err_out:
+    if (dict)
+        av_dict_free(&dict);
+
+    return err;
 }
 
 int qsv_init(AVCodecContext *s)