diff options
| author | Philip Gladstone <philipjsg@users.sourceforge.net> | 2005-01-03 02:40:22 +0000 |
|---|---|---|
| committer | Philip Gladstone <philipjsg@users.sourceforge.net> | 2005-01-03 02:40:22 +0000 |
| commit | 597c9f2bc97107c244ef65f61d39656796c5694c (patch) | |
| tree | e69e5d5a9ed6aeaeb1eec1424f27c71876b3e99c /tests | |
| parent | ad5a429c49669411e17ef2fbbc1f327b3b8e9d93 (diff) | |
| download | ffmpeg-streaming-597c9f2bc97107c244ef65f61d39656796c5694c.zip ffmpeg-streaming-597c9f2bc97107c244ef65f61d39656796c5694c.tar.gz | |
Remove .mpg streams due to a standards compliance issue
Originally committed as revision 3794 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.conf | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/test.conf b/tests/test.conf index 9c45ec3..5e58975 100644 --- a/tests/test.conf +++ b/tests/test.conf @@ -99,36 +99,36 @@ MaxTime 100 </Stream> -<Stream test_h.mpg> -Feed feed1.ffm +#<Stream test_h.mpg> +#Feed feed1.ffm # -VideoFrameRate 10 -VideoSize 352x288 -VideoBitRate 100 -VideoGopSize 30 -NoAudio - -PreRoll 10 -StartSendOnKey -MaxTime 100 - -</Stream> - -<Stream test_l.mpg> -Feed feed1.ffm +#VideoFrameRate 10 +#VideoSize 352x288 +#VideoBitRate 100 +#VideoGopSize 30 +#NoAudio + +#PreRoll 10 +#StartSendOnKey +#MaxTime 100 +# +#</Stream> +# +#<Stream test_l.mpg> +#Feed feed1.ffm +## +#VideoFrameRate 2 +#VideoSize 320x240 +#VideoBitRate 40 +#VideoGopSize 20 +#NoAudio +# +#PreRoll 20 +#StartSendOnKey +#MaxTime 100 +# +#</Stream> # -VideoFrameRate 2 -VideoSize 320x240 -VideoBitRate 40 -VideoGopSize 20 -NoAudio - -PreRoll 20 -StartSendOnKey -MaxTime 100 - -</Stream> - <Stream test.swf> Feed feed1.ffm # |
