This allows expressing dependencies in a more correct way.tags/n3.4
| @@ -1714,6 +1714,7 @@ CONFIG_EXTRA=" | |||
| h264parse | |||
| h264pred | |||
| h264qpel | |||
| hevc_ps | |||
| hpeldsp | |||
| huffman | |||
| huffyuvdsp | |||
| @@ -1912,6 +1913,7 @@ error_resilience_select="me_cmp" | |||
| faandct_deps="faan fdctdsp" | |||
| faanidct_deps="faan idctdsp" | |||
| h264dsp_select="startcode" | |||
| hevc_ps_select="golomb" | |||
| intrax8_select="blockdsp idctdsp" | |||
| mdct_select="fft" | |||
| rdft_select="fft" | |||
| @@ -1996,7 +1998,7 @@ h264_decoder_suggest="error_resilience" | |||
| hap_decoder_select="snappy texturedsp" | |||
| hap_encoder_deps="libsnappy" | |||
| hap_encoder_select="texturedspenc" | |||
| hevc_decoder_select="bswapdsp cabac golomb videodsp" | |||
| hevc_decoder_select="bswapdsp cabac hevc_ps videodsp" | |||
| huffyuv_decoder_select="bswapdsp huffyuvdsp" | |||
| huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp" | |||
| iac_decoder_select="imc_decoder" | |||
| @@ -2215,9 +2217,9 @@ h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264" | |||
| h264_vaapi_encoder_select="vaapi_encode golomb" | |||
| hevc_nvenc_encoder_deps="nvenc" | |||
| hevc_qsv_decoder_deps="libmfx" | |||
| hevc_qsv_encoder_deps="libmfx" | |||
| hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec" | |||
| hevc_qsv_encoder_select="qsvenc" | |||
| hevc_qsv_encoder_deps="libmfx" | |||
| hevc_qsv_encoder_select="hevc_ps qsvenc" | |||
| hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" | |||
| hevc_vaapi_encoder_select="vaapi_encode golomb" | |||
| mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG" | |||
| @@ -2239,7 +2241,7 @@ nvenc_hevc_encoder_select="hevc_nvenc_encoder" | |||
| # parsers | |||
| h264_parser_select="golomb h264dsp h264parse" | |||
| hevc_parser_select="golomb" | |||
| hevc_parser_select="hevc_ps" | |||
| mpegaudio_parser_select="mpegaudioheader" | |||
| mpegvideo_parser_select="mpegvideo" | |||
| mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp" | |||
| @@ -65,6 +65,7 @@ OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o | |||
| OBJS-$(CONFIG_H264PARSE) += h264_parse.o h2645_parse.o h264_ps.o | |||
| OBJS-$(CONFIG_H264PRED) += h264pred.o | |||
| OBJS-$(CONFIG_H264QPEL) += h264qpel.o | |||
| OBJS-$(CONFIG_HEVC_PS) += hevc_ps.o | |||
| OBJS-$(CONFIG_HPELDSP) += hpeldsp.o | |||
| OBJS-$(CONFIG_HUFFMAN) += huffman.o | |||
| OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o | |||
| @@ -266,13 +267,13 @@ OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o | |||
| OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o | |||
| OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o | |||
| OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o | |||
| OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o hevc_ps.o hevc_sei.o \ | |||
| OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.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_NVENC_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 hevc_ps.o hevc_data.o | |||
| h2645_parse.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 \ | |||
| @@ -731,7 +732,7 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o | |||
| OBJS-$(CONFIG_H261_PARSER) += h261_parser.o | |||
| OBJS-$(CONFIG_H263_PARSER) += h263_parser.o | |||
| OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o | |||
| OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o h2645_parse.o hevc_ps.o hevc_data.o | |||
| OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o h2645_parse.o hevc_data.o | |||
| OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o | |||
| OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o | |||
| OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ | |||