X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=51efc39d258f241e743835e49d121ca0ae064346;hb=4cc0f79a2c11f4ef53ee1b1199896832915a668e;hp=d5314776bfc0557aa279273430abc053af122b04;hpb=705eb5a1774938ff6c3bd07af1d7574bf4016581;p=ffmpeg diff --git a/configure b/configure index d5314776bfc..51efc39d258 100755 --- a/configure +++ b/configure @@ -227,6 +227,7 @@ External library support: --enable-librtmp enable RTMP[E] support via librtmp [no] --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no] --enable-libshine enable fixed-point MP3 encoding via libshine [no] + --enable-libsmbclient enable Samba protocol via libsmbclient [no] --enable-libsoxr enable Include libsoxr resampling [no] --enable-libspeex enable Speex de/encoding via libspeex [no] --enable-libssh enable SFTP protocol via libssh [no] @@ -286,6 +287,7 @@ Toolchain options: --pkg-config=PKGCONFIG use pkg-config tool PKGCONFIG [$pkg_config_default] --pkg-config-flags=FLAGS pass additional flags to pkgconf [] --ranlib=RANLIB use ranlib RANLIB [$ranlib_default] + --doxygen=DOXYGEN use DOXYGEN to generate API doc [$doxygen_default] --host-cc=HOSTCC use host C compiler HOSTCC --host-cflags=HCFLAGS use HCFLAGS when compiling for host --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host @@ -1348,6 +1350,7 @@ EXTERNAL_LIBRARY_LIST=" librtmp libschroedinger libshine + libsmbclient libsoxr libspeex libssh @@ -1800,7 +1803,9 @@ CONFIG_EXTRA=" bswapdsp cabac dsputil + dvprofile exif + fdctdsp frame_thread_encoder gcrypt golomb @@ -1826,6 +1831,7 @@ CONFIG_EXTRA=" mpegvideo mpegvideoenc nettle + pixblockdsp qpeldsp rangecoder riffdec @@ -1877,6 +1883,7 @@ CMDLINE_SET=" cross_prefix cxx dep_cc + doxygen extra_version gas host_cc @@ -1993,7 +2000,7 @@ threads_if_any="$THREADS_LIST" # subsystems dct_select="rdft" -dsputil_select="idctdsp" +dsputil_select="fdctdsp idctdsp pixblockdsp" error_resilience_select="dsputil" frame_thread_encoder_deps="encoders threads" intrax8_select="error_resilience" @@ -2003,7 +2010,7 @@ mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp dsputil h264chroma hpeldsp idctdsp videodsp" -mpegvideoenc_select="dsputil mpegvideo qpeldsp" +mpegvideoenc_select="dsputil mpegvideo pixblockdsp qpeldsp" # decoders / encoders aac_decoder_select="mdct sinewin" @@ -2022,9 +2029,9 @@ amv_decoder_select="sp5x_decoder exif" amv_encoder_select="aandcttables mpegvideoenc" ape_decoder_select="bswapdsp llauddsp" asv1_decoder_select="blockdsp bswapdsp idctdsp" -asv1_encoder_select="bswapdsp dsputil" +asv1_encoder_select="bswapdsp fdctdsp pixblockdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp" -asv2_encoder_select="bswapdsp dsputil" +asv2_encoder_select="bswapdsp fdctdsp pixblockdsp" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" atrac3p_decoder_select="mdct sinewin" @@ -2041,9 +2048,9 @@ cscd_decoder_suggest="zlib" dca_decoder_select="mdct" dirac_decoder_select="dsputil dwt golomb videodsp" dnxhd_decoder_select="blockdsp idctdsp" -dnxhd_encoder_select="aandcttables blockdsp dsputil idctdsp mpegvideoenc" -dvvideo_decoder_select="idctdsp" -dvvideo_encoder_select="dsputil" +dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" +dvvideo_decoder_select="dvprofile idctdsp" +dvvideo_encoder_select="dsputil dvprofile fdctdsp pixblockdsp" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" @@ -2132,13 +2139,13 @@ opus_decoder_deps="swresample" png_decoder_select="zlib" png_encoder_select="huffyuvencdsp zlib" prores_decoder_select="blockdsp idctdsp" -prores_encoder_select="dsputil" +prores_encoder_select="fdctdsp" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="audio_frame_queue lpc audiodsp" ra_144_decoder_select="audiodsp" ralf_decoder_select="golomb" -rawvideo_decoder_select="dsputil" +rawvideo_decoder_select="dsputil bswapdsp" rtjpeg_decoder_select="dsputil" rv10_decoder_select="error_resilience h263_decoder h263dsp mpeg_er" rv10_encoder_select="h263_encoder" @@ -2352,6 +2359,8 @@ caf_demuxer_select="riffdec" dirac_demuxer_select="dirac_parser" dts_demuxer_select="dca_parser" dtshd_demuxer_select="dca_parser" +dv_demuxer_select="dvprofile" +dv_muxer_select="dvprofile" dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" @@ -2465,6 +2474,7 @@ librtmpe_protocol_deps="librtmp" librtmps_protocol_deps="librtmp" librtmpt_protocol_deps="librtmp" librtmpte_protocol_deps="librtmp" +libsmbclient_protocol_deps="libsmbclient gplv3" libssh_protocol_deps="libssh" mmsh_protocol_select="http_protocol" mmst_protocol_select="network" @@ -2524,6 +2534,7 @@ mcdeint_filter_deps="avcodec gpl" movie_filter_deps="avcodec avformat" mp_filter_deps="gpl avcodec swscale inline_asm" mpdecimate_filter_deps="gpl avcodec" +mpdecimate_filter_select="dsputil pixblockdsp" mptestsrc_filter_deps="gpl" negate_filter_deps="lut_filter" perspective_filter_deps="gpl" @@ -2541,7 +2552,7 @@ smartblur_filter_deps="gpl swscale" showspectrum_filter_deps="avcodec" showspectrum_filter_select="rdft" spp_filter_deps="gpl avcodec" -spp_filter_select="dsputil fft idctdsp" +spp_filter_select="dsputil fft idctdsp fdctdsp pixblockdsp" stereo3d_filter_deps="gpl" subtitles_filter_deps="avformat avcodec libass" super2xsai_filter_deps="gpl" @@ -2618,6 +2629,7 @@ cc_default="gcc" cxx_default="g++" host_cc_default="gcc" cp_f="cp -f" +doxygen_default="doxygen" install="install" ln_s="ln -s -f" nm_default="nm -g" @@ -2994,7 +3006,8 @@ case "$toolchain" in ;; esac -set_default arch cc cxx pkg_config ranlib strip sysinclude target_exec target_os yasmexe +set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ + target_exec target_os yasmexe enabled cross_compile || host_cc_default=$cc set_default host_cc @@ -3003,6 +3016,11 @@ if ! $pkg_config --version >/dev/null 2>&1; then pkg_config=false fi +if test $doxygen != $doxygen_default && \ + ! $doxygen --version >/dev/null 2>&1; then + warn "Specified doxygen \"$doxygen\" not found, API documentation will fail to build." +fi + exesuf() { case $1 in mingw32*|win32|win64|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;; @@ -4225,6 +4243,7 @@ die_license_disabled_gpl() { die_license_disabled gpl frei0r die_license_disabled gpl libcdio +die_license_disabled gpl libsmbclient die_license_disabled gpl libutvideo die_license_disabled gpl libvidstab die_license_disabled gpl libx264 @@ -4241,6 +4260,7 @@ enabled gpl && die_license_disabled_gpl nonfree openssl die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb +die_license_disabled version3 libsmbclient die_license_disabled version3 libvo_aacenc die_license_disabled version3 libvo_amrwbenc @@ -4729,6 +4749,9 @@ enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_buffer +enabled libsmbclient && { { check_pkg_config smbclient libsmbclient.h smbc_init && + require_pkg_config smbclient libsmbclient.h smbc_init; } || + require smbclient libsmbclient.h smbc_init -lsmbclient; } enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex @@ -5051,10 +5074,12 @@ elif enabled ccc; then add_cflags -msg_disable unsupieee elif enabled gcc; then check_optflags -fno-tree-vectorize + check_cflags -Werror=format-security check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes check_cflags -Werror=return-type check_cflags -Werror=vla + check_cflags -Wformat enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized elif enabled llvm_gcc; then check_cflags -mllvm -stack-alignment=16 @@ -5388,6 +5413,7 @@ LD_PATH=$LD_PATH DLLTOOL=$dlltool WINDRES=$windres DEPWINDRES=$dep_cc +DOXYGEN=$doxygen LDFLAGS=$LDFLAGS SHFLAGS=$(echo $($ldflags_filter $SHFLAGS)) ASMSTRIPFLAGS=$ASMSTRIPFLAGS