Skip to content

F
ffmpeg.wasm-core
Commit b51527d8 authored by Alex Beregszaszi's avatar Alex Beregszaszi
Browse files
Options

make ffserver regressions work again 

Originally committed as revision 4694 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ac6a655b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
tests/test.conf
View file @ b51527d8
...@@ -57,7 +57,7 @@ FileMaxSize 100M ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
......
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