diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-09 15:10:30 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-09 15:10:30 +0200 |
| commit | 63bb3db9aac34940ee4e415fe7bf096a3c0ab2a4 (patch) | |
| tree | 38d3b0eb160ed8a759989bf28a3a4a5f31f833cb /libavcodec/Makefile | |
| parent | bc94b9534cbe842204f5a440d05ffb10ff7629c3 (diff) | |
| parent | 0fdc9f81a00f0f32eb93c324bad65d8014deb4dd (diff) | |
| download | ffmpeg-63bb3db9aac34940ee4e415fe7bf096a3c0ab2a4.tar.gz | |
Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'
* commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd':
build: Add missing hevc_ps dependency for QSV HEVC encoder
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e8dd6e0fd9..dc6371eae1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -345,7 +345,8 @@ OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o hevc_parse.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.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_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ + h2645_parse.o hevc_ps.o hevc_data.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 \ |