summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 18:11:03 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 18:11:03 +0000
commit0ffaae60e8492f7e797e72338c7e6f3efcd52330 (patch)
treec816bc85cbf7b974783cc331b73794fdfff88b99 /configure
parentdc61014319bacd28b1a6c15976e72356b0870e97 (diff)
parent7d16d8533daf73b66d318c5e27de3b17208aa0ba (diff)
Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'
* commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba': build: More precise dependencies for h264dsp Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index d17bde6d82..03a3bec06d 100755
--- a/configure
+++ b/configure
@@ -2225,6 +2225,7 @@ dirac_parse_select="golomb"
error_resilience_select="me_cmp"
faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp"
+h264dsp_select="startcode"
frame_thread_encoder_deps="encoders threads"
intrax8_select="error_resilience"
mdct_select="fft"
@@ -2315,7 +2316,7 @@ h263_encoder_select="aandcttables h263dsp mpegvideoenc"
h263i_decoder_select="h263_decoder"
h263p_decoder_select="h263_decoder"
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_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"