generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify, use ffserver launch directive

Browse Source 
Originally committed as revision 13367 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-24 23:48:02 +00:00
parent 0c5421585a
commit 1faf7a20d5
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/server-regression.sh
View File

@ -12,8 +12,6 @@ rm -f tests/feed1.ffm
./ffserver -d -f tests/test.conf 2> /dev/null & ./ffserver -d -f tests/test.conf 2> /dev/null &
FFSERVER_PID=$! FFSERVER_PID=$!
echo "Waiting for feeds to startup..." 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 $? cd tests/data || exit $?
rm -f ff-*; rm -f ff-*;
@ -30,7 +28,6 @@ FFMPEG_PID=$!
# the status page is always different # the status page is always different
md5sum $MDFILES > ffserver.regression md5sum $MDFILES > ffserver.regression
) )
kill $FFMPEG_PID
kill $FFSERVER_PID kill $FFSERVER_PID
wait > /dev/null 2>&1 wait > /dev/null 2>&1
rm -f tests/feed1.ffm rm -f tests/feed1.ffm

2
tests/test.conf
View File

@ -57,7 +57,7 @@ FileMaxSize 100M
# Fire up ffmpeg pointing at this stream # 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 ACL allow localhost
</Feed> </Feed>