Commit 0ffaae60 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '7d16d853'

* commit '7d16d853':
  build: More precise dependencies for h264dsp
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents dc610143 7d16d853
...@@ -2225,6 +2225,7 @@ dirac_parse_select="golomb" ...@@ -2225,6 +2225,7 @@ dirac_parse_select="golomb"
error_resilience_select="me_cmp" error_resilience_select="me_cmp"
faandct_deps="faan fdctdsp" faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp" faanidct_deps="faan idctdsp"
h264dsp_select="startcode"
frame_thread_encoder_deps="encoders threads" frame_thread_encoder_deps="encoders threads"
intrax8_select="error_resilience" intrax8_select="error_resilience"
mdct_select="fft" mdct_select="fft"
...@@ -2315,7 +2316,7 @@ h263_encoder_select="aandcttables h263dsp mpegvideoenc" ...@@ -2315,7 +2316,7 @@ h263_encoder_select="aandcttables h263dsp mpegvideoenc"
h263i_decoder_select="h263_decoder" h263i_decoder_select="h263_decoder"
h263p_decoder_select="h263_decoder" h263p_decoder_select="h263_decoder"
h263p_encoder_select="h263_encoder" h263p_encoder_select="h263_encoder"
h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp"
h264_decoder_suggest="error_resilience" h264_decoder_suggest="error_resilience"
h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment