X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=60e16c11536f1b100527df46d50ec6f3439f391d;hb=7c5417ef360ecb0553903fcce9ef885d25716cee;hp=83791fc02bb1855efe8f2ba74b307fbd44fb3f3e;hpb=5755bc88e51a82dd00897d840df2a688631da768;p=ffmpeg diff --git a/configure b/configure index 83791fc02bb..60e16c11536 100755 --- a/configure +++ b/configure @@ -1083,9 +1083,9 @@ need_memalign="altivec neon sse" inline_asm_deps="!tms470" # decoders / encoders / hardware accelerators -aac_decoder_select="fft mdct" +aac_decoder_select="fft mdct aac_parser" aac_encoder_select="fft mdct" -ac3_decoder_select="fft mdct" +ac3_decoder_select="fft mdct ac3_parser" alac_encoder_select="lpc" atrac3_decoder_select="fft mdct" cavs_decoder_select="golomb" @@ -1103,11 +1103,14 @@ flac_decoder_select="golomb" flac_encoder_select="golomb lpc" flashsv_decoder_select="zlib" flashsv_encoder_select="zlib" +flv_decoder_select="h263_decoder" flv_encoder_select="h263_encoder" h261_encoder_select="aandct" +h263_decoder_select="h263_parser" h263_encoder_select="aandct" h263_vaapi_hwaccel_deps="va_va_h" h263_vaapi_hwaccel_select="vaapi h263_decoder" +h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_decoder_select="golomb" h264_vaapi_hwaccel_deps="va_va_h" @@ -1120,8 +1123,10 @@ jpegls_encoder_select="golomb" ljpeg_encoder_select="aandct" loco_decoder_select="golomb" mjpeg_encoder_select="aandct" +mlp_decoder_select="mlp_parser" mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" +mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" @@ -1131,17 +1136,24 @@ mpeg2_vaapi_hwaccel_deps="va_va_h" mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" mpeg4_vaapi_hwaccel_deps="va_va_h" mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" +mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" +msmpeg4v1_decoder_select="h263_decoder" msmpeg4v1_encoder_select="h263_encoder" +msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" +msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" nellymoser_decoder_select="fft mdct" nellymoser_encoder_select="fft mdct" png_decoder_select="zlib" png_encoder_select="zlib" qdm2_decoder_select="fft mdct rdft" +rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" +rv20_decoder_select="h263_decoder" rv20_encoder_select="h263_encoder" rv30_decoder_select="golomb" rv40_decoder_select="golomb" @@ -1154,7 +1166,9 @@ svq3_decoder_suggest="zlib" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" +truehd_decoder_select="mlp_decoder" tscc_decoder_select="zlib" +vc1_decoder_select="h263_decoder" vc1_vaapi_hwaccel_deps="va_va_h" vc1_vaapi_hwaccel_select="vaapi vc1_decoder" vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" @@ -1167,7 +1181,9 @@ wmav1_decoder_select="fft mdct" wmav1_encoder_select="fft mdct" wmav2_decoder_select="fft mdct" wmav2_encoder_select="fft mdct" +wmv1_decoder_select="h263_decoder" wmv1_encoder_select="h263_encoder" +wmv2_decoder_select="h263_decoder" wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" @@ -1180,6 +1196,9 @@ zmbv_encoder_select="zlib" # parsers h264_parser_select="golomb" +# bitstream_filters +aac_adtstoasc_bsf_select="aac_parser" + # external libraries libdirac_decoder_deps="libdirac !libschroedinger" libdirac_encoder_deps="libdirac" @@ -1208,6 +1227,7 @@ ac3_demuxer_deps="ac3_parser" asf_stream_muxer_select="asf_muxer" avisynth_demuxer_deps="avisynth" dirac_demuxer_deps="dirac_parser" +eac3_demuxer_select="ac3_parser" ipod_muxer_select="mov_muxer" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" @@ -1222,6 +1242,7 @@ psp_muxer_select="mov_muxer" rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" +spdif_muxer_select="aac_parser" tg2_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer" w64_demuxer_deps="wav_demuxer" @@ -1247,7 +1268,7 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow" vfwcap_indev_extralibs="-lvfw32" x11_grab_device_indev_deps="x11grab XShmCreateImage" -x11_grab_device_indev_extralibs="-lX11 -lXext" +x11_grab_device_indev_extralibs="-lX11 -lXext -lXfixes" # protocols gopher_protocol_deps="network" @@ -1619,6 +1640,41 @@ elif $cc -V 2>&1 | grep -q Sun; then cc_version="AV_STRINGIFY(__SUNPRO_C)" DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -xM1' + filter_cflags=suncc_flags + suncc_flags(){ + for flag; do + case $flag in + -march=*|-mcpu=*) + case "${flag#*=}" in + native) echo -xtarget=native ;; + v9) echo -xarch=sparc ;; + ultrasparc) echo -xarch=sparcvis ;; + ultrasparc3|niagara*) echo -xarch=sparcvis2 ;; + i586|pentium) echo -xchip=pentium ;; + i686|pentiumpro|pentium2) echo -xtarget=pentium_pro ;; + pentium3*|c3-2) echo -xtarget=pentium3 ;; + pentium-m) echo -xarch=sse2 -xchip=pentium3 ;; + pentium4*) echo -xtarget=pentium4 ;; + prescott|nocona) echo -xarch=sse3 -xchip=pentium4 ;; + *-sse3) echo -xarch=sse3 ;; + core2) echo -xarch=ssse3 -xchip=core2 ;; + amdfam10|barcelona) echo -xarch=sse4_1 ;; + athlon-4|athlon-[mx]p) echo -xarch=ssea ;; + k8|opteron|athlon64|athlon-fx) + echo -xarch=sse2a ;; + athlon*) echo -xarch=pentium_proa ;; + esac + ;; + -std=c99) echo -xc99 ;; + -fomit-frame-pointer) echo -xregs=frameptr ;; + -fPIC) echo -KPIC -xcode=pic32 ;; + -Os) echo -O5 -xspace ;; + -W*,*) echo $flag ;; + -f*-*|-W*) ;; + *) echo $flag ;; + esac + done + } fi test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc" @@ -1876,8 +1932,6 @@ esac enable $arch $subarch enabled spic && enable pic -# This is the same check as used in libavutil/internal.h -# to enable RIP-relative addressing for x86_64 inline asm. check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic # OS specific @@ -2340,11 +2394,11 @@ enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg 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/theora.h theora_info_init -ltheora -logg +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 libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm && - { check_cpp_condition x264.h "X264_BUILD >= 78" || - die "ERROR: libx264 version must be >= 0.78."; } + { check_cpp_condition x264.h "X264_BUILD >= 79" || + die "ERROR: libx264 version must be >= 0.79."; } enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib @@ -2441,8 +2495,15 @@ enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack enabled x11grab && check_header X11/Xlib.h && check_header X11/extensions/XShm.h && +check_header X11/extensions/Xfixes.h && check_func XOpenDisplay -lX11 && -check_func XShmCreateImage -lX11 -lXext +check_func XShmCreateImage -lX11 -lXext && +check_func XFixesGetCursorImage -lX11 -lXext -lXfixes + +check_cpp_condition \ + vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || + { echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau support." && + disable vdpau; } enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" @@ -2473,6 +2534,8 @@ elif enabled optimizations; then if enabled xlc; then add_cflags -O5 add_ldflags -O5 + elif enabled suncc; then + add_cflags -O5 elif enabled ccc; then add_cflags -fast else @@ -2757,6 +2820,7 @@ cat > $TMPH <