diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:53:14 +0200 |
| commit | 7871eb43616776626ec9f9075b6d0a8cf73d159e (patch) | |
| tree | f9a88703414cd33e32c5f682974d8b4f96837b92 /libavcodec/Makefile | |
| parent | 587980eb7a1f4b0228204aa846b72dc761e49779 (diff) | |
| parent | 66acb76bb0492b263215ca9b4d927a7be39ace02 (diff) | |
| download | ffmpeg-7871eb43616776626ec9f9075b6d0a8cf73d159e.tar.gz | |
Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b5be7bcecd..3fa6d30bea 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -286,6 +286,7 @@ OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_parse.o +OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o hevc_parse.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o OBJS-$(CONFIG_HQ_HQA_DECODER) += hq_hqa.o hq_hqadata.o hq_hqadsp.o \ canopus.o |