diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-08 19:45:09 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-08 19:45:09 +0300 |
| commit | 1926f13a206bfbd99abf536e7424e2b321f2e2ad (patch) | |
| tree | a13838e5728599f13f4152fe0bee18092e6a2b9c /libavcodec/allcodecs.c | |
| parent | 51f977c2c4b39d80ed39107a21b1647abce1acca (diff) | |
| parent | 2fd6e7d077f590e4d7195356f9baeb271f8b9ae2 (diff) | |
Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'
* commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2':
libavcodec/mjpeg_qsv: Add QSV MJPEG encoder
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 98655ddd7c..d96e499ba7 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -669,6 +669,7 @@ static void register_all(void) REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi); REGISTER_ENCODER(LIBKVAZAAR, libkvazaar); REGISTER_DECODER(MJPEG_CUVID, mjpeg_cuvid); + REGISTER_ENCODER(MJPEG_QSV, mjpeg_qsv); REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi); REGISTER_DECODER(MPEG1_CUVID, mpeg1_cuvid); REGISTER_DECODER(MPEG2_CUVID, mpeg2_cuvid); |