Commit 1aa59d3a authored by alex's avatar alex

make ffserver regressions work again


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4694 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f7801bb1
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment