X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=70ad8a5700d6a4254fb6a7b61304fb43f4b4e2cf;hb=33586ee770edaa036c27508b5ec5c8c263973941;hp=f8a13165e7236f66da2964303f562954be5fe6b7;hpb=deeb7012b9998dac57ea7ef25462ada43bef7c3d;p=ffmpeg diff --git a/configure b/configure index f8a13165e72..70ad8a5700d 100755 --- a/configure +++ b/configure @@ -115,7 +115,6 @@ Configuration options: --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 - --enable-beos-netserver enable BeOS netserver --disable-everything disable all components listed below --disable-encoder=NAME disable encoder NAME --enable-encoder=NAME enable encoder NAME @@ -183,6 +182,7 @@ External library support: --enable-libtheora enable Theora encoding via libtheora [no] --enable-libvorbis enable Vorbis encoding via libvorbis, native implementation exists [no] + --enable-libvpx enable VP8 support via libvpx [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libxvid enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists [no] @@ -252,6 +252,8 @@ EOF exit 0 } +quotes='""' + log(){ echo "$@" >> $logfile } @@ -893,7 +895,6 @@ CONFIG_LIST=" avfilter_lavf avformat avisynth - beos_netserver bzlib dct doc @@ -927,6 +928,7 @@ CONFIG_LIST=" libspeex libtheora libvorbis + libvpx libx264 libxvid lpc @@ -1084,6 +1086,9 @@ HAVE_LIST=" struct_sockaddr_in6 struct_sockaddr_sa_len struct_sockaddr_storage + symver + symver_gnu_asm + symver_asm_label sys_mman_h sys_resource_h sys_select_h @@ -1198,6 +1203,8 @@ fast_unaligned_if_any="armv6 ppc x86" need_memalign="altivec neon sse" inline_asm_deps="!tms470" +symver_if_any="symver_asm_label symver_gnu_asm" + # subsystems mdct_select="fft" rdft_select="fft" @@ -1270,6 +1277,7 @@ png_decoder_select="zlib" png_encoder_select="zlib" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft" +real_144_encoder_select="lpc" rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" rv20_decoder_select="h263_decoder" @@ -1349,6 +1357,8 @@ libschroedinger_encoder_deps="libschroedinger" libspeex_decoder_deps="libspeex" libtheora_encoder_deps="libtheora" libvorbis_encoder_deps="libvorbis" +libvpx_decoder_deps="libvpx" +libvpx_encoder_deps="libvpx" libx264_encoder_deps="libx264" libxvid_encoder_deps="libxvid" @@ -1385,10 +1395,6 @@ alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_indev_extralibs="-lasound" alsa_outdev_deps="alsa_asoundlib_h" alsa_outdev_extralibs="-lasound" -audio_beos_indev_deps="audio_beos" -audio_beos_indev_extralibs="-lmedia -lbe" -audio_beos_outdev_deps="audio_beos" -audio_beos_outdev_extralibs="-lmedia -lbe" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" dv1394_indev_deps="dv1394 dv_demuxer" jack_indev_deps="jack_jack_h" @@ -1407,6 +1413,7 @@ x11_grab_device_indev_extralibs="-lX11 -lXext -lXfixes" gopher_protocol_deps="network" http_protocol_deps="network" http_protocol_select="tcp_protocol" +mmst_protocol_deps="network" rtmp_protocol_select="tcp_protocol" rtp_protocol_select="udp_protocol" tcp_protocol_deps="network" @@ -1422,6 +1429,7 @@ avformat_deps="avcodec" # programs ffmpeg_deps="avcodec avformat swscale" +ffmpeg_select="buffer_filter" ffplay_deps="avcodec avformat swscale sdl" ffplay_select="rdft" ffprobe_deps="avcodec avformat" @@ -2121,30 +2129,10 @@ enabled spic && enable pic # OS specific case $target_os in - beos|haiku|zeta) - prefix_default="$HOME/config" - # 3 gcc releases known for BeOS, each with ugly bugs - gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" - case "$gcc_version" in - 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" - disable mmx - ;; - *20010315*) echo "BeBits gcc" - add_cflags -fno-expensive-optimizations - ;; - esac - SHFLAGS=-nostart - # enable BeOS things - enable audio_beos - # no need for libm, but the inet stuff - # Check for BONE - # XXX: actually should check for NOT net_server - if echo $BEINCLUDES | grep -q 'headers/be/bone'; then - network_extralibs="-lbind -lsocket" - else - enable beos_netserver - network_extralibs="-lnet" - fi ;; + haiku) + prefix_default="/boot/common" + network_extralibs="-lnetwork" + ;; sunos) FFSERVERLDFLAGS="" SHFLAGS='-shared -Wl,-h,$$(@F)' @@ -2584,7 +2572,7 @@ for thread in $THREADS_LIST; do done check_lib math.h sin -lm -check_lib va/va.h vaInitialize -lva +disabled vaapi || check_lib va/va.h vaInitialize -lva check_mathfunc exp2 check_mathfunc exp2f @@ -2611,15 +2599,17 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb -lm enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -lm enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg -enabled librtmp && require librtmp librtmp/rtmp.h RTMP_Init -lrtmp +enabled librtmp && require librtmp librtmp/rtmp.h RTMP_Init $(pkg-config --libs librtmp) enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) && require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0) enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg +enabled libvpx && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx && + require2 libvpx "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver" -lvpx enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm && - { check_cpp_condition x264.h "X264_BUILD >= 90" || - die "ERROR: libx264 version must be >= 0.90."; } + { check_cpp_condition x264.h "X264_BUILD >= 98" || + die "ERROR: libx264 version must be >= 0.98."; } enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib @@ -2731,8 +2721,17 @@ check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUI check_ldflags -Wl,-Bsymbolic echo "X{};" > $TMPV -test_ldflags -Wl,--version-script,$TMPV && +if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' + check_cc < $TMPH < $TMPH <