diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /configure | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
| download | ffmpeg-b0387edd5e766b1032f946d6cdb35b765bb45435.tar.gz | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 59 |
1 files changed, 1 insertions, 58 deletions
@@ -1737,56 +1737,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 \ @@ -1812,7 +1762,6 @@ test_deps _muxer _demuxer \ wav \ yuv4mpegpipe=yuv4mpeg \ -ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder" colormatrix1_test_deps="colormatrix_filter" colormatrix2_test_deps="colormatrix_filter" flashsv2_test_deps="zlib" @@ -1981,16 +1930,12 @@ 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_FATE_TESTS=$(find_tests lavf-fate) LAVF_TESTS=$(find_tests lavf) LAVFI_TESTS=$(find_tests lavfi) SEEK_TESTS=$(find_tests seek seek_) -ALL_TESTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" - -pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST)) +ALL_TESTS="$LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" for n in $COMPONENT_LIST; do v=$(toupper ${n%s})_LIST @@ -3791,8 +3736,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $ALL_COMPONENTS \ cat >>config.mak <<EOF -ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS) -VCODEC_TESTS=$(print_enabled -n _test $VCODEC_TESTS) LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS) LAVF_TESTS=$(print_enabled -n _test $LAVF_TESTS) LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS) |