X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=4dcb27b4232721938bd6b47b717eb65420f77aef;hb=fea9243d53e0e281450e39ec0e1b4b3c122a8a29;hp=da74ccd96140f5816e9971aee1884556c45d0b33;hpb=40231a58a0d8bffbe2264fe980483edaa6fc422e;p=ffmpeg diff --git a/configure b/configure index da74ccd9614..4dcb27b4232 100755 --- a/configure +++ b/configure @@ -250,7 +250,6 @@ External library support: --enable-libsoxr enable Include libsoxr resampling [no] --enable-libspeex enable Speex de/encoding via libspeex [no] --enable-libssh enable SFTP protocol via libssh [no] - --enable-libstagefright-h264 enable H.264 decoding via libstagefright [no] --enable-libtesseract enable Tesseract, needed for ocr filter [no] --enable-libtheora enable Theora encoding via libtheora [no] --enable-libtwolame enable MP2 encoding via libtwolame [no] @@ -1478,7 +1477,6 @@ EXTERNAL_LIBRARY_LIST=" libsoxr libspeex libssh - libstagefright_h264 libtesseract libtheora libtwolame @@ -1822,6 +1820,7 @@ MATH_FUNCS=" exp2f expf hypot + isfinite isinf isnan ldexpf @@ -2466,6 +2465,8 @@ wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp" wmv2_encoder_select="h263_encoder wmv2dsp" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" +xma1_decoder_select="wmapro_decoder" +xma2_decoder_select="wmapro_decoder" zerocodec_decoder_select="zlib" zlib_decoder_select="zlib" zlib_encoder_select="zlib" @@ -2639,7 +2640,6 @@ libshine_encoder_select="audio_frame_queue" libspeex_decoder_deps="libspeex" libspeex_encoder_deps="libspeex" libspeex_encoder_select="audio_frame_queue" -libstagefright_h264_decoder_deps="libstagefright_h264" libtheora_encoder_deps="libtheora" libtwolame_encoder_deps="libtwolame" libvo_aacenc_encoder_deps="libvo_aacenc" @@ -2900,9 +2900,13 @@ showcqt_filter_select="fft" showfreqs_filter_deps="avcodec" showfreqs_filter_select="fft" showspectrum_filter_deps="avcodec" -showspectrum_filter_select="rdft" +showspectrum_filter_select="fft" +showspectrumpic_filter_deps="avcodec" +showspectrumpic_filter_select="fft" sofalizer_filter_deps="netcdf avcodec" sofalizer_filter_select="fft" +spectrumsynth_filter_deps="avcodec" +spectrumsynth_filter_select="fft" spp_filter_deps="gpl avcodec" spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp" stereo3d_filter_deps="gpl" @@ -4241,6 +4245,8 @@ elif enabled mips; then disable msa ;; *) + # Unknown CPU. Disable everything. + warn "unknown CPU. Disabling all MIPS optimizations." disable mipsfpu disable mips32r2 disable mips32r6 @@ -5420,7 +5426,6 @@ enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } || enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint enabled decklink && { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; } enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; } -enabled gcrypt && require2 gcrypt gcrypt.h gcry_mpi_new -lgcrypt enabled gmp && require2 gmp gmp.h mpz_export -lgmp enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init enabled ladspa && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; } @@ -5476,9 +5481,6 @@ enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr" enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init enabled libspeex && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex -enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h - media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h - media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static enabled libtesseract && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && @@ -5579,6 +5581,20 @@ if enabled libdc1394; then enable libdc1394_1; } || die "ERROR: No version of libdc1394 found " fi + +if enabled gcrypt; then + GCRYPT_CONFIG="${cross_prefix}libgcrypt-config" + if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then + gcrypt_cflags=$("${GCRYPT_CONFIG}" --cflags) + gcrypt_libs=$("${GCRYPT_CONFIG}" --libs) + check_func_headers gcrypt.h gcry_mpi_new $gcrypt_cflags $gcrypt_libs || + die "ERROR: gcrypt not found" + add_cflags $gcrypt_cflags && add_extralibs $gcrypt_libs + else + require2 gcrypt gcrypt.h gcry_mpi_new -lgcrypt + fi +fi + if ! disabled sdl; then SDL_CONFIG="${cross_prefix}sdl-config" if check_pkg_config sdl SDL_events.h SDL_PollEvent; then @@ -5764,6 +5780,7 @@ check_disable_warning -Wno-parentheses check_disable_warning -Wno-switch check_disable_warning -Wno-format-zero-length check_disable_warning -Wno-pointer-sign +check_disable_warning -Wno-unused-const-variable # add some linker flags check_ldflags -Wl,--warn-common @@ -6069,6 +6086,7 @@ enabled sofalizer_filter && prepend avfilter_deps "avcodec" enabled showfreqs_filter && prepend avfilter_deps "avcodec" enabled showspectrum_filter && prepend avfilter_deps "avcodec" enabled smartblur_filter && prepend avfilter_deps "swscale" +enabled spectrumsynth_filter && prepend avfilter_deps "avcodec" enabled subtitles_filter && prepend avfilter_deps "avformat avcodec" enabled uspp_filter && prepend avfilter_deps "avcodec" @@ -6362,7 +6380,7 @@ cat > $TMPH <