aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2005-11-13 03:00:30 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2005-11-13 03:00:30 +0000
commitb51527d8506607e97b6cf7ba04a1921fe7f36881 (patch)
tree0b16710cdfcb68e7e0f7a2c0e096d1fd5df0319b
parentac6a655b8a191a56dc194b548d8ba7bb16ea6abb (diff)
downloadffmpeg-b51527d8506607e97b6cf7ba04a1921fe7f36881.tar.gz
make ffserver regressions work again
Originally committed as revision 4694 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--tests/test.conf9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test.conf b/tests/test.conf
index 84e014c9fc..8b87dbf1ca 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -57,7 +57,7 @@ FileMaxSize 100M
# Fire up ffmpeg pointing at this stream
-Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%02d.pgm
+Launch ../ffmpeg -loop -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm
acl allow localhost
</Feed>
@@ -218,7 +218,8 @@ MaxTime 100
<Stream test.jpg>
Feed feed1.ffm
-Format mjpeg
+Format jpeg
+Strict -1
VideoFrameRate 1
VideoSize 352x288
@@ -231,7 +232,8 @@ PreRoll 2
<Stream test_small.jpg>
Feed feed1.ffm
-Format mjpeg
+Format jpeg
+Strict -1
VideoFrameRate 1
VideoSize 160x128
@@ -245,6 +247,7 @@ PreRoll 2
Feed feed1.ffm
Format mpjpeg
+Strict -1
VideoFrameRate 1
VideoSize 320x240