Commit 1faf7a20 authored by Baptiste Coudurier's avatar Baptiste Coudurier

simplify, use ffserver launch directive

Originally committed as revision 13367 to svn://
parent 0c542158
......@@ -12,8 +12,6 @@ rm -f tests/feed1.ffm
./ffserver -d -f tests/test.conf 2> /dev/null &
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 &
cd tests/data || exit $?
rm -f ff-*;
......@@ -30,7 +28,6 @@ FFMPEG_PID=$!
# the status page is always different
md5sum $MDFILES > ffserver.regression
wait > /dev/null 2>&1
rm -f tests/feed1.ffm
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment