X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=1bf8f8069ca1846b361febcc5804fe5c268c0f81;hb=ae81e8a9c5e5511a5bdc34b9a10697c835923c0c;hp=d037da105cdc1510cf52eb1e479c4d38b2cd3739;hpb=29f9d82d23ffc4e48c220c68c7041ca581632981;p=ffmpeg diff --git a/configure b/configure index d037da105cd..1bf8f8069ca 100755 --- a/configure +++ b/configure @@ -133,9 +133,9 @@ Component options: --disable-postproc disable libpostproc build --disable-avfilter disable libavfilter build --enable-avresample enable libavresample build [no] - --disable-pthreads disable pthreads [auto] - --disable-w32threads disable Win32 threads [auto] - --disable-os2threads disable OS/2 threads [auto] + --disable-pthreads disable pthreads [autodetect] + --disable-w32threads disable Win32 threads [autodetect] + --disable-os2threads disable OS/2 threads [autodetect] --disable-network disable network support [no] --disable-dct disable DCT code --disable-dwt disable DWT code @@ -255,10 +255,10 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxavs enable AVS encoding via xavs [no] - --enable-libxcb enable X11 grabbing using XCB [auto] - --enable-libxcb-shm enable X11 grabbing shm communication [auto] - --enable-libxcb-xfixes enable X11 grabbing mouse rendering [auto] - --enable-libxcb-shape enable X11 grabbing shape rendering [auto] + --enable-libxcb enable X11 grabbing using XCB [autodetect] + --enable-libxcb-shm enable X11 grabbing shm communication [autodetect] + --enable-libxcb-xfixes enable X11 grabbing mouse rendering [autodetect] + --enable-libxcb-shape enable X11 grabbing shape rendering [autodetect] --enable-libxvid enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists [no] --enable-libzmq enable message passing via libzmq [no] @@ -358,7 +358,6 @@ Optimization options (experts only): --disable-neon disable NEON optimizations --disable-inline-asm disable use of inline assembly --disable-yasm disable use of nasm/yasm assembly - --disable-mips32r2 disable MIPS32R2 optimizations --disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations --disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations --disable-mipsfpu disable floating point MIPS optimizations @@ -1329,6 +1328,7 @@ EXAMPLE_LIST=" filtering_video_example metadata_example muxing_example + qsvdec_example remuxing_example resampling_audio_example scaling_video_example @@ -1481,7 +1481,6 @@ SUBSYSTEM_LIST=" mdct pixelutils network - qsv rdft " @@ -1769,6 +1768,7 @@ SYSTEM_FUNCS=" TOOLCHAIN_FEATURES=" as_dn_directive as_func + as_object_arch asm_mod_q attribute_may_alias attribute_packed @@ -1838,6 +1838,7 @@ HAVE_LIST=" section_data_rel_ro texi2html threads + vaapi_x11 vdpau_x11 xlib " @@ -1856,6 +1857,7 @@ CONFIG_EXTRA=" faandct faanidct fdctdsp + fmtconvert frame_thread_encoder gcrypt golomb @@ -1886,6 +1888,7 @@ CONFIG_EXTRA=" nettle pixblockdsp qpeldsp + qsv rangecoder riffdec riffenc @@ -1996,7 +1999,6 @@ setend_deps="arm" map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM mipsfpu_deps="mips" -mips32r2_deps="mips" mipsdspr1_deps="mips" mipsdspr2_deps="mips" @@ -2074,7 +2076,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" aac_decoder_select="imdct15 mdct sinewin" aac_encoder_select="audio_frame_queue iirfilter mdct sinewin" aac_latm_decoder_select="aac_decoder aac_latm_parser" -ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct" +ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct" ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct" ac3_encoder_select="ac3dsp audiodsp mdct me_cmp" ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp" @@ -2104,7 +2106,7 @@ comfortnoise_encoder_select="lpc" cook_decoder_select="audiodsp mdct sinewin" cscd_decoder_select="lzo" cscd_decoder_suggest="zlib" -dca_decoder_select="mdct" +dca_decoder_select="fmtconvert mdct" dirac_decoder_select="dwt golomb videodsp mpegvideoenc" dnxhd_decoder_select="blockdsp idctdsp" dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" @@ -2229,6 +2231,7 @@ svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc" svq3_decoder_select="h264_decoder hpeldsp tpeldsp" svq3_decoder_suggest="zlib" tak_decoder_select="audiodsp" +tdsc_decoder_select="zlib mjpeg_decoder" theora_decoder_select="vp3_decoder" thp_decoder_select="mjpeg_decoder" tiff_decoder_suggest="zlib lzma" @@ -2490,7 +2493,7 @@ xwma_demuxer_select="riffdec" # indevs / outdevs alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_outdev_deps="alsa_asoundlib_h" -avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia -framework CoreGraphics" +avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia" avfoundation_indev_select="avfoundation" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" caca_outdev_deps="libcaca" @@ -2594,6 +2597,8 @@ deshake_filter_select="pixelutils" drawtext_filter_deps="libfreetype" ebur128_filter_deps="gpl" eq_filter_deps="gpl" +fftfilt_filter_deps="avcodec" +fftfilt_filter_select="rdft" flite_filter_deps="libflite" frei0r_filter_deps="frei0r dlopen" frei0r_src_filter_deps="frei0r dlopen" @@ -2653,6 +2658,7 @@ filtering_audio_example_deps="avfilter avcodec avformat avutil" filtering_video_example_deps="avfilter avcodec avformat avutil" metadata_example_deps="avformat avutil" muxing_example_deps="avcodec avformat avutil swscale" +qsvdec_example_deps="avcodec avutil libmfx h264_qsv_decoder vaapi_x11" remuxing_example_deps="avcodec avformat avutil" resampling_audio_example_deps="avutil swresample" scaling_video_example_deps="avutil swscale" @@ -2989,24 +2995,6 @@ disabled logging && logfile=/dev/null echo "# $0 $FFMPEG_CONFIGURATION" > $logfile set >> $logfile -test -n "$cross_prefix" && enable cross_compile - -if enabled cross_compile; then - test -n "$arch" && test -n "$target_os" || - die "Must specify target arch and OS when cross-compiling" -fi - -ar_default="${cross_prefix}${ar_default}" -cc_default="${cross_prefix}${cc_default}" -cxx_default="${cross_prefix}${cxx_default}" -nm_default="${cross_prefix}${nm_default}" -pkg_config_default="${cross_prefix}${pkg_config_default}" -ranlib_default="${cross_prefix}${ranlib_default}" -strip_default="${cross_prefix}${strip_default}" -windres_default="${cross_prefix}${windres_default}" - -sysinclude_default="${sysroot}/usr/include" - test -n "$valgrind" && toolchain="valgrind-memcheck" case "$toolchain" in @@ -3093,6 +3081,24 @@ case "$toolchain" in ;; esac +test -n "$cross_prefix" && enable cross_compile + +if enabled cross_compile; then + test -n "$arch" && test -n "$target_os" || + die "Must specify target arch and OS when cross-compiling" +fi + +ar_default="${cross_prefix}${ar_default}" +cc_default="${cross_prefix}${cc_default}" +cxx_default="${cross_prefix}${cxx_default}" +nm_default="${cross_prefix}${nm_default}" +pkg_config_default="${cross_prefix}${pkg_config_default}" +ranlib_default="${cross_prefix}${ranlib_default}" +strip_default="${cross_prefix}${strip_default}" +windres_default="${cross_prefix}${windres_default}" + +sysinclude_default="${sysroot}/usr/include" + set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ target_exec target_os yasmexe enabled cross_compile || host_cc_default=$cc @@ -3251,8 +3257,7 @@ msvc_flags(){ -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \ -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \ -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \ - -wd4554 \ - -wd4273 -wd4701 ;; + -wd4273 -wd4554 -wd4701 ;; esac done } @@ -3529,7 +3534,9 @@ probe_cc(){ _flags='-nologo' _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64' if [ $pfx = hostcc ]; then - append _cflags -Dsnprintf=_snprintf + if [ -z "$cl_major_ver" ] || [ $cl_major_ver -le 18 ]; then + append _cflags -Dsnprintf=_snprintf + fi fi disable stripping elif $_cc --version 2>/dev/null | grep -q ^cparser; then @@ -3743,6 +3750,7 @@ elif enabled arm; then elif check_arm_arch 6T2; then echo armv6t2; elif check_arm_arch 7; then echo armv7; elif check_arm_arch 7A 7_A; then echo armv7-a; + elif check_arm_arch 7S; then echo armv7-a; elif check_arm_arch 7R 7_R; then echo armv7-r; elif check_arm_arch 7M 7_M; then echo armv7-m; elif check_arm_arch 7EM 7E_M; then echo armv7-m; @@ -4033,6 +4041,7 @@ case $target_os in SHFLAGS='-shared -Wl,-h,$$(@F)' enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" network_extralibs="-lsocket -lnsl" + add_cppflags -D__EXTENSIONS__ # When using suncc to build, the Solaris linker will mark # an executable with each instruction set encountered by # the Solaris assembler. As our libraries contain their own @@ -4316,10 +4325,12 @@ case $libc_type in add_compat strtod.o strtod=avpriv_strtod ;; msvcrt) - add_compat strtod.o strtod=avpriv_strtod - add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ - _snprintf=avpriv_snprintf \ - vsnprintf=avpriv_vsnprintf + if [ -z "$cl_major_ver" ] || [ $cl_major_ver -le 18 ]; then + add_compat strtod.o strtod=avpriv_strtod + add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ + _snprintf=avpriv_snprintf \ + vsnprintf=avpriv_vsnprintf + fi ;; esac @@ -4558,6 +4569,11 @@ EOF check_as <