diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:45:39 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:45:39 +0100 |
| commit | a82d1a8c7a4b313a8d41334acbbb767c530c8e26 (patch) | |
| tree | defd0e5a1d633a7bcf3fd14f5c66d3172feac698 /libavcodec/Makefile | |
| parent | b975aeec02e4518a4e5f2996cf51d113e42e1727 (diff) | |
| parent | 31fe1f2577f8208f79a4b3ab59465e78dd497555 (diff) | |
| download | ffmpeg-a82d1a8c7a4b313a8d41334acbbb767c530c8e26.tar.gz | |
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
lavc: VAAPI H.265 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 11d399efc0..971d11d0ed 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -325,6 +325,7 @@ OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec_h2645.o OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o h2645_parse.o +OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o vaapi_encode_h26x.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o OBJS-$(CONFIG_HQ_HQA_DECODER) += hq_hqa.o hq_hqadata.o hq_hqadsp.o \ canopus.o |