X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=f26f8de11095c7e5925bb8a587b89885ec762f14;hb=0e55902324f07c91821154ad4cf84cbc8066a1f5;hp=8fbc31550af531857f6cb3c0a8ea1c7eec2ae6cb;hpb=86602d1c79929caa1b88b942f0074b1481b52235;p=ffmpeg diff --git a/configure b/configure index 8fbc31550af..f26f8de1109 100755 --- a/configure +++ b/configure @@ -76,7 +76,6 @@ Configuration options: --enable-shared build shared libraries [no] --enable-gpl allow use of GPL code, the resulting libs and binaries will be under GPL [no] - --enable-version2 force GPL version 2 [no] --enable-version3 upgrade (L)GPL to version 3 [no] --enable-nonfree allow use of nonfree code, the resulting libs and binaries will be unredistributable [no] @@ -94,7 +93,7 @@ Configuration options: --disable-postproc disable libpostproc build --disable-avfilter disable video filter support [no] --disable-pthreads disable pthreads [auto] - --enable-w32threads use Win32 threads [no] + --disable-w32threads disable Win32 threads [auto] --enable-x11grab enable X11 grabbing [no] --disable-network disable network support [no] --enable-gray enable full grayscale support (slower color) @@ -112,6 +111,7 @@ Configuration options: --enable-vaapi enable VAAPI code [autodetect] --enable-vdpau enable VDPAU code [autodetect] --disable-dxva2 disable DXVA2 code + --disable-vda disable VDA code --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary) --enable-hardcoded-tables use hardcoded tables instead of runtime generation --enable-memalign-hack emulate memalign, interferes with memory debuggers @@ -163,7 +163,7 @@ Configuration options: External library support: --enable-avisynth enable reading of AVISynth script files [no] --enable-bzlib enable bzlib [autodetect] - --enable-libcelt enable CELT/Opus decoding via libcelt [no] + --enable-libcelt enable CELT decoding via libcelt [no] --enable-frei0r enable frei0r video filtering --enable-libaacplus enable AAC+ encoding via libaacplus [no] --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] @@ -183,9 +183,11 @@ External library support: --enable-libopenjpeg enable JPEG 2000 decoding via OpenJPEG [no] --enable-librtmp enable RTMP[E] support via librtmp [no] --enable-libschroedinger enable Dirac support via libschroedinger [no] - --enable-libspeex enable Speex encoding and decoding via libspeex [no] + --enable-libspeex enable Speex support via libspeex [no] --enable-libstagefright-h264 enable H.264 decoding via libstagefright [no] --enable-libtheora enable Theora encoding via libtheora [no] + --enable-libutvideo enable Ut Video decoding via libutvideo [no] + --enable-libv4l2 enable libv4l2/v4l-utils [no] --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no] --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no] --enable-libvorbis enable Vorbis encoding via libvorbis, @@ -845,6 +847,9 @@ check_exec_crash(){ static void sighandler(int sig){ raise(SIGTERM); } +int func(void){ + $code +} int main(void){ signal(SIGILL, sighandler); signal(SIGFPE, sighandler); @@ -852,7 +857,7 @@ int main(void){ #ifdef SIGBUS signal(SIGBUS, sighandler); #endif - { $code } + return func(); } EOF } @@ -1011,11 +1016,14 @@ CONFIG_LIST=" libopencore_amrwb libopencv libopenjpeg + libpulse librtmp libschroedinger libspeex libstagefright_h264 libtheora + libutvideo + libv4l2 libvo_aacenc libvo_amrwbenc libvorbis @@ -1047,8 +1055,8 @@ CONFIG_LIST=" swscale_alpha thumb vaapi + vda vdpau - version2 version3 x11grab zlib @@ -1121,6 +1129,7 @@ HAVE_LIST=" attribute_may_alias attribute_packed bswap + cbrtf closesocket cmov dcbzl @@ -1186,7 +1195,6 @@ HAVE_LIST=" setrlimit strerror_r strptime - strtok_r struct_addrinfo struct_ipv6_mreq struct_sockaddr_in6 @@ -1216,7 +1224,6 @@ HAVE_LIST=" CONFIG_EXTRA=" avutil gplv3 - gplv2 lgplv3 " @@ -1373,7 +1380,9 @@ h264_decoder_select="golomb h264dsp h264pred" h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" h264_dxva2_hwaccel_deps="dxva2api_h" h264_dxva2_hwaccel_select="dxva2 h264_decoder" -h264_vaapi_hwaccel_select="vaapi" +h264_vaapi_hwaccel_select="vaapi h264_decoder" +h264_vda_hwaccel_deps="VideoDecodeAcceleration_VDADecoder_h" +h264_vda_hwaccel_select="vda" h264_vdpau_decoder_select="vdpau h264_decoder" imc_decoder_select="fft mdct sinewin" jpegls_decoder_select="golomb" @@ -1420,7 +1429,6 @@ nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="mdct sinewin" png_decoder_select="zlib" png_encoder_select="zlib" -prores_gpl_decoder_deps="version2 gpl" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="lpc" @@ -1517,6 +1525,7 @@ libvpx_encoder_deps="libvpx" libx264_encoder_deps="libx264" libxavs_encoder_deps="libxavs" libxvid_encoder_deps="libxvid" +libutvideo_decoder_deps="libutvideo gpl" # demuxers / muxers ac3_demuxer_select="ac3_parser" @@ -1561,9 +1570,11 @@ jack_indev_deps="jack_jack_h sem_timedwait" lavfi_indev_deps="avfilter" libcdio_indev_deps="libcdio" libdc1394_indev_deps="libdc1394" +libv4l2_indev_deps="libv4l2" openal_indev_deps="openal" oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="soundcard_h sys_soundcard_h" +pulse_indev_deps="libpulse" sdl_outdev_deps="sdl" sndio_indev_deps="sndio_h" sndio_outdev_deps="sndio_h" @@ -1586,17 +1597,14 @@ tcp_protocol_deps="network" udp_protocol_deps="network" # filters -abuffer_filter_deps="strtok_r" -aconvert_filter_deps="strtok_r" -aformat_filter_deps="strtok_r" amovie_filter_deps="avcodec avformat" blackframe_filter_deps="gpl" boxblur_filter_deps="gpl" cropdetect_filter_deps="gpl" delogo_filter_deps="gpl" drawtext_filter_deps="libfreetype" -frei0r_filter_deps="frei0r dlopen strtok_r" -frei0r_src_filter_deps="frei0r dlopen strtok_r" +frei0r_filter_deps="frei0r dlopen" +frei0r_src_filter_deps="frei0r dlopen" hqdn3d_filter_deps="gpl" movie_filter_deps="avcodec avformat" mp_filter_deps="gpl avcodec" @@ -2293,7 +2301,7 @@ case "$arch" in arch="sparc" subarch="sparc64" ;; - i[3-6]86|i86pc|BePC|x86pc|x86_64|amd64) + i[3-6]86|i86pc|BePC|x86pc|x86_64|x86_32|amd64) arch="x86" ;; esac @@ -2563,6 +2571,7 @@ case $target_os in disable network else target_os=mingw32 + enable_weak w32threads fi LIBTARGET=i386 if enabled x86_64; then @@ -2705,11 +2714,7 @@ die_license_disabled version3 libopencore_amrwb die_license_disabled version3 libvo_aacenc die_license_disabled version3 libvo_amrwbenc -! enabled gpl && enabled version2 && die "LGPLv2 mode is unsupported" -enabled version3 && enabled version2 && ! enabled nonfree && die "GPLv2 (not v2+) and GPLv3 without --enable-nonfree" - enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } -enabled version2 && enabled gpl && enable gplv2 disabled optimizations || check_cflags -fomit-frame-pointer @@ -2947,7 +2952,6 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign check_func setrlimit check_func strerror_r check_func strptime -check_func strtok_r check_func_headers conio.h kbhit check_func_headers windows.h PeekNamedPipe check_func_headers io.h setmode @@ -2973,6 +2977,14 @@ check_header X11/extensions/XvMClib.h disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib +# check for VDA header +if ! disabled vda; then + if check_header VideoDecodeAcceleration/VDADecoder.h; then + enable vda + add_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore + fi +fi + # check for some common methods of building with pthread support # do this before the optional library checks as some of them require pthreads if ! disabled pthreads && ! enabled w32threads; then @@ -3004,6 +3016,7 @@ check_lib math.h sin -lm && LIBM="-lm" disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd enabled vaapi && require vaapi va/va.h vaInitialize -lva +check_mathfunc cbrtf check_mathfunc exp2 check_mathfunc exp2f check_mathfunc llrint @@ -3036,6 +3049,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_de enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg +enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new 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 libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex @@ -3043,6 +3057,8 @@ enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessS 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 enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg +enabled libutvideo && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++ +enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg @@ -3052,8 +3068,8 @@ enabled libvpx && { enabled libvpx_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_CQ" -lvpx || die "ERROR: libvpx encoder version must be >=0.9.6"; } } enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && - { check_cpp_condition x264.h "X264_BUILD >= 115" || - die "ERROR: libx264 version must be >= 0.115."; } + { check_cpp_condition x264.h "X264_BUILD >= 118" || + die "ERROR: libx264 version must be >= 0.118."; } enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do @@ -3163,6 +3179,7 @@ check_cflags -Wtype-limits check_cflags -Wundef check_cflags -Wmissing-prototypes check_cflags -Wno-pointer-to-int-cast +check_cflags -Wstrict-prototypes enabled extra_warnings && check_cflags -Winline # add some linker flags @@ -3363,11 +3380,14 @@ echo "libopencore-amrnb support ${libopencore_amrnb-no}" echo "libopencore-amrwb support ${libopencore_amrwb-no}" echo "libopencv support ${libopencv-no}" echo "libopenjpeg enabled ${libopenjpeg-no}" +echo "libpulse enabled ${libpulse-no}" echo "librtmp enabled ${librtmp-no}" echo "libschroedinger enabled ${libschroedinger-no}" echo "libspeex enabled ${libspeex-no}" echo "libstagefright-h264 enabled ${libstagefright_h264-no}" echo "libtheora enabled ${libtheora-no}" +echo "libutvideo enabled ${libutvideo-no}" +echo "libv4l2 enabled ${libv4l2-no}" echo "libvo-aacenc support ${libvo_aacenc-no}" echo "libvo-amrwbenc support ${libvo_amrwbenc-no}" echo "libvorbis enabled ${libvorbis-no}" @@ -3392,8 +3412,6 @@ if enabled nonfree; then license="nonfree and unredistributable" elif enabled gplv3; then license="GPL version 3 or later" -elif enabled gplv2; then - license="GPL version 2" elif enabled lgplv3; then license="LGPL version 3 or later" elif enabled gpl; then