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/Makefile | |
| parent | a82d1a8c7a4b313a8d41334acbbb767c530c8e26 (diff) | |
| parent | 83f230c2445a94fdd94c66504482217fcece5909 (diff) | |
| download | ffmpeg-939345854a9e8ab32e88b9c9c99c8772049fb965.tar.gz | |
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
* commit '83f230c2445a94fdd94c66504482217fcece5909':
lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 971d11d0ed..b502e06d7c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -367,6 +367,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o +OBJS-$(CONFIG_MJPEG_VAAPI_ENCODER) += vaapi_encode_mjpeg.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o |