diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-08 13:45:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-08 13:45:09 -0300 |
| commit | 1926f13a206bfbd99abf536e7424e2b321f2e2ad (patch) | |
| tree | a13838e5728599f13f4152fe0bee18092e6a2b9c /libavcodec/qsv.c | |
| parent | 51f977c2c4b39d80ed39107a21b1647abce1acca (diff) | |
| parent | 2fd6e7d077f590e4d7195356f9baeb271f8b9ae2 (diff) | |
| download | ffmpeg-1926f13a206bfbd99abf536e7424e2b321f2e2ad.tar.gz | |
Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'
* commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2':
libavcodec/mjpeg_qsv: Add QSV MJPEG encoder
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsv.c')
| -rw-r--r-- | libavcodec/qsv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 56ca9df262..5180eb8771 100644 --- 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; } |