make ffserver regressions work again

Originally committed as revision 4694 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/tests/test.conf b/tests/test.conf
index 84e014c9fc1dca6d87beed13ab2a2ed2fcb9f41a..8b87dbf1ca2b5a8b03b958ba399ef645080bd67b 100644 (file)
--- 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