---
configure | 70 +++++++++++++++++++++++++++----------------------------------
1 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/configure b/configure
index a73924a..d49f679 100755
--- a/configure
+++ b/configure
@@ -903,8 +903,17 @@ COMPONENT_LIST="
protocols
"
+PROGRAM_LIST="
+ avconv
+ avplay
+ avprobe
+ avserver
+ ffmpeg
+"
+
CONFIG_LIST="
$COMPONENT_LIST
+ $PROGRAM_LIST
aandct
ac3dsp
avcodec
@@ -918,11 +927,6 @@ CONFIG_LIST="
dwt
dxva2
fastdiv
- ffmpeg
- avconv
- avplay
- avprobe
- avserver
fft
frei0r
gnutls
@@ -1659,6 +1663,8 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# configurable options
+enable $PROGRAM_LIST
+
enable avcodec
enable avdevice
enable avfilter
@@ -1667,12 +1673,6 @@ enable avutil
enable postproc
enable swscale
-enable avconv
-enable avplay
-enable avprobe
-enable avserver
-enable ffmpeg
-
enable asm
enable debug
enable doc
@@ -1748,6 +1748,20 @@ INDEV_LIST=$(find_things indev _IN
libavdevice/alldevices.c)
PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c)
+COMPONENT_LISTS="
+ $BSF_LIST
+ $DECODER_LIST
+ $DEMUXER_LIST
+ $ENCODER_LIST
+ $FILTER_LIST
+ $HWACCEL_LIST
+ $INDEV_LIST
+ $MUXER_LIST
+ $OUTDEV_LIST
+ $PARSER_LIST
+ $PROTOCOL_LIST
+"
+
find_tests(){
map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v
'[^-a-z0-9_]')
}
@@ -1758,6 +1772,8 @@ LAVF_TESTS=$(find_tests lavf)
LAVFI_TESTS=$(find_tests lavfi)
SEEK_TESTS=$(find_tests seek seek_)
+TEST_LISTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS"
+
pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST))
for n in $COMPONENT_LIST; do
@@ -1766,7 +1782,7 @@ for n in $COMPONENT_LIST; do
eval ${n}_if_any="\$$v"
done
-enable $ARCH_EXT_LIST $ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS
$SEEK_TESTS
+enable $ARCH_EXT_LIST $TEST_LISTS
die_unknown(){
echo "Unknown option \"$1\"."
@@ -3119,22 +3135,8 @@ enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST \
$CONFIG_EXTRA \
$HAVE_LIST \
- $DECODER_LIST \
- $ENCODER_LIST \
- $HWACCEL_LIST \
- $PARSER_LIST \
- $BSF_LIST \
- $DEMUXER_LIST \
- $MUXER_LIST \
- $FILTER_LIST \
- $INDEV_LIST \
- $OUTDEV_LIST \
- $PROTOCOL_LIST \
- $ACODEC_TESTS \
- $VCODEC_TESTS \
- $LAVF_TESTS \
- $LAVFI_TESTS \
- $SEEK_TESTS \
+ $COMPONENT_LISTS \
+ $TEST_LISTS \
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
@@ -3382,17 +3384,7 @@ print_config ARCH_ "$config_files" $ARCH_LIST
print_config HAVE_ "$config_files" $HAVE_LIST
print_config CONFIG_ "$config_files" $CONFIG_LIST \
$CONFIG_EXTRA \
- $DECODER_LIST \
- $ENCODER_LIST \
- $HWACCEL_LIST \
- $PARSER_LIST \
- $BSF_LIST \
- $DEMUXER_LIST \
- $MUXER_LIST \
- $FILTER_LIST \
- $PROTOCOL_LIST \
- $INDEV_LIST \
- $OUTDEV_LIST \
+ $COMPONENT_LISTS \
cat >>config.mak <<EOF
ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS)
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
