Merge commit 'a14a12ca137bf1526452b97bedfc9f7b301d4e04'

[ffmpeg] / libavcodec / qsv.c

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 56ca9df262de52c76cecb39d275cae8c6843628d..5180eb87711d52458a6b1776a81ccb9fb0466c79 100644 (file)
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -20,6 +20,7 @@
 
 #include <mfx/mfxvideo.h>
 #include <mfx/mfxplugin.h>
+#include <mfx/mfxjpeg.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -56,6 +57,8 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
     case AV_CODEC_ID_VP8:
         return MFX_CODEC_VP8;
 #endif
+    case AV_CODEC_ID_MJPEG:
+        return MFX_CODEC_JPEG;
     default:
         break;
     }