diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:46:52 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:46:52 +0100 |
| commit | 939345854a9e8ab32e88b9c9c99c8772049fb965 (patch) | |
| tree | cfd14d6e1004644dcec785914835998063afa07a /libavcodec/allcodecs.c | |
| parent | a82d1a8c7a4b313a8d41334acbbb767c530c8e26 (diff) | |
| parent | 83f230c2445a94fdd94c66504482217fcece5909 (diff) | |
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
* commit '83f230c2445a94fdd94c66504482217fcece5909':
lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@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 f206fecf8c..c5b675baa5 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -225,6 +225,7 @@ void avcodec_register_all(void) REGISTER_DECODER(MIMIC, mimic); REGISTER_ENCDEC (MJPEG, mjpeg); REGISTER_DECODER(MJPEGB, mjpegb); + REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi); REGISTER_DECODER(MMVIDEO, mmvideo); REGISTER_DECODER(MOTIONPIXELS, motionpixels); #if FF_API_XVMC |