X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=a1dbe9f9a7ec94e6667d6df4eed7cfffce29899e;hb=a982e5a031c9c92726593851cee7a3792e3cbed7;hp=79b948e4f3e047748f491d8a8529bdc9dac686a6;hpb=779222dbfe19ebe731dcdff460e1b1807b9285a7;p=ffmpeg diff --git a/configure b/configure index 79b948e4f3e..a1dbe9f9a7e 100755 --- a/configure +++ b/configure @@ -176,8 +176,6 @@ External library support: --enable-libfreetype enable libfreetype [no] --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] - --enable-libnut enable NUT (de)muxing via libnut, - native (de)muxer exists [no] --enable-libopenjpeg enable JPEG 2000 decoding via OpenJPEG [no] --enable-libpulse enable Pulseaudio input via libpulse [no] --enable-librtmp enable RTMP[E] support via librtmp [no] @@ -258,7 +256,7 @@ Developer options (useful when working on Libav itself): --disable-optimizations disable compiler optimizations --enable-extra-warnings enable more compiler warnings --samples=PATH location of test samples for FATE, if not set use - \$FATE_SAMPLES at make invocation time. + \$LIBAV_SAMPLES at make invocation time. --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only; should be used only for debugging purposes) @@ -948,7 +946,6 @@ CONFIG_LIST=" libfreetype libgsm libmp3lame - libnut libopencore_amrnb libopencore_amrwb libopencv @@ -1455,13 +1452,12 @@ dirac_demuxer_select="dirac_parser" eac3_demuxer_select="ac3_parser" flac_demuxer_select="flac_parser" ipod_muxer_select="mov_muxer" -libnut_demuxer_deps="libnut" -libnut_muxer_deps="libnut" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_suggest="zlib bzlib" mov_demuxer_suggest="zlib" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" +mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" ogg_demuxer_select="golomb" @@ -1531,6 +1527,7 @@ frei0r_filter_extralibs='$ldl' frei0r_src_filter_deps="frei0r dlopen strtok_r" frei0r_src_filter_extralibs='$ldl' hqdn3d_filter_deps="gpl" +resample_filter_deps="avresample" ocv_filter_deps="libopencv" yadif_filter_deps="gpl" @@ -1540,7 +1537,8 @@ avfilter_deps="swscale" avformat_deps="avcodec" # programs -avconv_deps="avcodec avfilter avformat avresample swscale format_filter" +avconv_deps="avcodec avfilter avformat avresample swscale format_filter + setpts_filter" avplay_deps="avcodec avformat swscale sdl" avplay_select="rdft" avprobe_deps="avcodec avformat" @@ -1567,56 +1565,6 @@ test_deps(){ mxf_d10_test_deps="avfilter" seek_lavf_mxf_d10_test_deps="mxf_d10_test" -test_deps _encoder _decoder \ - adpcm_ima_qt \ - adpcm_ima_wav \ - adpcm_ms \ - adpcm_swf \ - adpcm_yamaha=adpcm_yam \ - alac \ - asv1 \ - asv2 \ - bmp \ - dnxhd="dnxhd_1080i dnxhd_720p dnxhd_720p_rd" \ - dvvideo="dv dv_411 dv50" \ - ffv1 \ - flac \ - flashsv \ - flv \ - adpcm_g726=g726 \ - gif \ - h261 \ - h263="h263 h263p" \ - huffyuv \ - jpegls \ - mjpeg="jpg mjpeg ljpeg" \ - mp2 \ - mpeg1video="mpeg mpeg1b" \ - mpeg2video="mpeg2 mpeg2_422 mpeg2_idct_int mpeg2_ilace mpeg2_ivlc_qprd" \ - mpeg2video="mpeg2thread mpeg2thread_ilace" \ - mpeg4="mpeg4 mpeg4_adap mpeg4_qpel mpeg4_qprd mpeg4adv mpeg4nr" \ - mpeg4="mpeg4thread error rc" \ - msmpeg4v3=msmpeg4 \ - msmpeg4v2 \ - pbm=pbmpipe \ - pcx \ - pgm="pgm pgmpipe" \ - png \ - ppm="ppm ppmpipe" \ - rawvideo="rgb yuv" \ - roq \ - rv10 \ - rv20 \ - sgi \ - snow="snow snowll" \ - svq1 \ - targa=tga \ - tiff \ - wmav1 \ - wmav2 \ - wmv1 \ - wmv2 \ - test_deps _muxer _demuxer \ aiff \ pcm_alaw=alaw \ @@ -1642,7 +1590,6 @@ test_deps _muxer _demuxer \ wav \ yuv4mpegpipe=yuv4mpeg \ -ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder" mpg_test_deps="mpeg1system_muxer mpegps_demuxer" # default parameters @@ -1786,15 +1733,11 @@ find_tests(){ map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]') } -ACODEC_TESTS=$(find_tests acodec) -VCODEC_TESTS=$(find_tests vsynth1) LAVF_TESTS=$(find_tests lavf) LAVFI_TESTS=$(find_tests lavfi) SEEK_TESTS=$(find_tests seek seek_) -ALL_TESTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" - -pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST)) +ALL_TESTS="$LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" for n in $COMPONENT_LIST; do v=$(toupper ${n%s})_LIST @@ -2968,7 +2911,6 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaa enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame -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 enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader @@ -3257,7 +3199,6 @@ echo "libdc1394 support ${libdc1394-no}" echo "libfaac enabled ${libfaac-no}" echo "libgsm enabled ${libgsm-no}" echo "libmp3lame enabled ${libmp3lame-no}" -echo "libnut enabled ${libnut-no}" echo "libopencore-amrnb support ${libopencore_amrnb-no}" echo "libopencore-amrwb support ${libopencore_amrwb-no}" echo "libopencv support ${libopencv-no}" @@ -3373,7 +3314,7 @@ SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME} SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS} SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB} SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB} -SAMPLES:=${samples:-\$(FATE_SAMPLES)} +SAMPLES:=${samples:-\$(LIBAV_SAMPLES)} EOF get_version(){ @@ -3433,8 +3374,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $ALL_COMPONENTS \ cat >>config.mak <