virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

make ffserver regressions work again

Browse Source 
Originally committed as revision 4694 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2005-11-13 03:00:30 +00:00
parent ac6a655b8a
commit b51527d850
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test.conf
View File

@ -57,7 +57,7 @@ FileMaxSize 100M
# Fire up ffmpeg pointing at this stream # 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 acl allow localhost
</Feed> </Feed>
@ -218,7 +218,8 @@ MaxTime 100
<Stream test.jpg> <Stream test.jpg>
Feed feed1.ffm Feed feed1.ffm
Format mjpeg Format jpeg
Strict -1
VideoFrameRate 1 VideoFrameRate 1
VideoSize 352x288 VideoSize 352x288
@ -231,7 +232,8 @@ PreRoll 2
<Stream test_small.jpg> <Stream test_small.jpg>
Feed feed1.ffm Feed feed1.ffm
Format mjpeg Format jpeg
Strict -1
VideoFrameRate 1 VideoFrameRate 1
VideoSize 160x128 VideoSize 160x128
@ -245,6 +247,7 @@ PreRoll 2
Feed feed1.ffm Feed feed1.ffm
Format mpjpeg Format mpjpeg
Strict -1
VideoFrameRate 1 VideoFrameRate 1
VideoSize 320x240 VideoSize 320x240