From 1faf7a20d5cbe76e0e7e012473555a59f885c43d Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 24 May 2008 23:48:02 +0000 Subject: [PATCH] simplify, use ffserver launch directive Originally committed as revision 13367 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/server-regression.sh | 3 --- tests/test.conf | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/server-regression.sh b/tests/server-regression.sh index b95b5a5..24685aa 100755 --- a/tests/server-regression.sh +++ b/tests/server-regression.sh @@ -12,8 +12,6 @@ rm -f tests/feed1.ffm ./ffserver -d -f tests/test.conf 2> /dev/null & FFSERVER_PID=$! echo "Waiting for feeds to startup..." -./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null & -FFMPEG_PID=$! ( cd tests/data || exit $? rm -f ff-*; @@ -30,7 +28,6 @@ FFMPEG_PID=$! # the status page is always different md5sum $MDFILES > ffserver.regression ) -kill $FFMPEG_PID kill $FFSERVER_PID wait > /dev/null 2>&1 rm -f tests/feed1.ffm diff --git a/tests/test.conf b/tests/test.conf index afd4c16..571048c 100644 --- a/tests/test.conf +++ b/tests/test.conf @@ -57,7 +57,7 @@ FileMaxSize 100M # Fire up ffmpeg pointing at this stream -#Launch ../../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm +Launch ./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm ACL allow localhost -- 2.7.4