Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'

* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
  avconv: add support for Intel QSV-accelerated transcoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 37a819e239..5e9a12741e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3012,6 +3012,11 @@ static int transcode_init(void)
 
             set_encoder_id(output_files[ost->file_index], ost);
 
+#if CONFIG_LIBMFX
+            if (qsv_transcode_init(ost))
+                exit_program(1);
+#endif
+
             if (!ost->filter &&
                 (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO ||
                  enc_ctx->codec_type == AVMEDIA_TYPE_AUDIO)) {