diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-18 09:02:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-18 09:02:58 +0000 |
| commit | 8d931070fc6248ba2d7c6b55d951be36532e90cf (patch) | |
| tree | 88f6b37bea097f68287b87c9aa56dfb0b5460459 /tests | |
| parent | 01f4895c682a1752bf6d138ffb0628470e16b85a (diff) | |
| download | ffmpeg-streaming-8d931070fc6248ba2d7c6b55d951be36532e90cf.zip ffmpeg-streaming-8d931070fc6248ba2d7c6b55d951be36532e90cf.tar.gz | |
ffserver segfault & other fatal failure fixes
Originally committed as revision 4454 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test.conf b/tests/test.conf index 5e58975..e57d524 100644 --- a/tests/test.conf +++ b/tests/test.conf @@ -218,7 +218,7 @@ MaxTime 100 <Stream test.jpg> Feed feed1.ffm -Format singlejpeg +Format mjpeg VideoFrameRate 1 VideoSize 352x288 @@ -231,7 +231,7 @@ PreRoll 2 <Stream test_small.jpg> Feed feed1.ffm -Format singlejpeg +Format mjpeg VideoFrameRate 1 VideoSize 160x128 |
