Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'
authorClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:10:30 +0000 (15:10 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:10:30 +0000 (15:10 +0200)
* commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd':
  build: Add missing hevc_ps dependency for QSV HEVC encoder

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/Makefile

@@@ -340,12 -269,10 +340,13 @@@ OBJS-$(CONFIG_HAP_ENCODER)             
  OBJS-$(CONFIG_HEVC_DECODER)            += hevcdec.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                            hevc_cabac.o hevc_refs.o hevcpred.o    \
                                            hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o
 +OBJS-$(CONFIG_HEVC_CUVID_DECODER)      += cuvid.o
 +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 \