[SCM] libav/experimental: The server configuration file is passed as a command line parameter.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:01:15 UTC 2013
The following commit has been merged in the experimental branch:
commit 46076a95a05a8862315df1f6f8e1db313f80c343
Author: Diego Biurrun <diego at biurrun.de>
Date: Thu Jun 7 21:36:58 2007 +0000
The server configuration file is passed as a command line parameter.
Originally committed as revision 9254 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 1f561aa..290afd0 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -13,7 +13,7 @@ mkdir -p data
#perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
#perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
-FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' test.conf | grep -v html`
+FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
rm -f feed1.ffm
../ffserver -d -f test.conf 2> /dev/null &
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list