[Ffmpeg-cvslog] CVS: ffmpeg/tests test.conf,1.6,1.7

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv18493/tests

Modified Files:
	test.conf 
Log Message:
ffserver segfault & other fatal failure fixes


Index: test.conf
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/test.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test.conf	3 Jan 2005 02:40:22 -0000	1.6
+++ test.conf	18 Jul 2005 09:02:58 -0000	1.7
@@ -218,7 +218,7 @@
 <Stream test.jpg>
 
 Feed feed1.ffm
-Format singlejpeg
+Format mjpeg
 
 VideoFrameRate 1
 VideoSize 352x288
@@ -231,7 +231,7 @@
 <Stream test_small.jpg>
 
 Feed feed1.ffm
-Format singlejpeg
+Format mjpeg
 
 VideoFrameRate 1
 VideoSize 160x128