diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-24 23:48:02 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-24 23:48:02 +0000 |
| commit | 1faf7a20d5cbe76e0e7e012473555a59f885c43d (patch) | |
| tree | 61702010ecea9016d360e4dee15ff645e98c244b | |
| parent | 0c5421585a11c6baf1db04ca0bad18e80d88dd08 (diff) | |
| download | ffmpeg-1faf7a20d5cbe76e0e7e012473555a59f885c43d.tar.gz | |
simplify, use ffserver launch directive
Originally committed as revision 13367 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | tests/server-regression.sh | 3 | ||||
| -rw-r--r-- | tests/test.conf | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/server-regression.sh b/tests/server-regression.sh index b95b5a57d4..24685aad64 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 afd4c16fbf..571048c3ea 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 </Feed> |