Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'

[ffmpeg] / configure

diff --git a/configure b/configure
index f2f555425bf4326094ee8e2247530c6a8fe3eed1..101954e3e45d39f4e198277da6543175227d12be 100755 (executable)
--- a/configure
+++ b/configure
@@ -1809,6 +1809,7 @@ h263i_decoder_select="h263_decoder"
 h263p_encoder_select="h263_encoder"
 h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
 h264_decoder_suggest="error_resilience"
+hevc_decoder_select="dsputil golomb videodsp"
 huffyuv_decoder_select="dsputil"
 huffyuv_encoder_select="dsputil huffman"
 iac_decoder_select="dsputil fft mdct sinewin"
@@ -4560,6 +4561,7 @@ elif enabled_any msvc icl; then
             add_cflags -Qansi-alias
         # icl will pass the inline asm tests but inline asm is currently
         # not supported (build will fail)
+        disabled inline_asm || warn "inline asm disabled due to issues with it in ICL"
         disable inline_asm
     fi
 fi