* Updated so that some streams actually work!

Originally committed as revision 456 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 311f48b..4c91570 100644 (file)
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -97,12 +97,17 @@ VideoFrameRate 3
 # The following abbreviation are defined : sqcif, qcif, cif, 4cif
 VideoSize    160x128
 
-# transmit only intra frames (useful for low bitrates) 
-VideoIntraOnly
+# transmit only intra frames (useful for low bitrates, but kills frame rate) 
+#VideoIntraOnly
 
 # If non intra only, an intra frame is transmitted every VideoGopSize
 # frames Video synchronization can only begin at an I frames.
-#VideoGopSize 12
+VideoGopSize 12
+
+# Choose your codecs: 
+
+#AudioCodec mp2
+#VideoCodec mpeg1video
 
 # Suppress audio
 #NoAudio
@@ -114,34 +119,34 @@ VideoIntraOnly
 
 # second mpeg stream with high frame rate
 
-<Stream test2.mpg>
-Feed feed1.ffm
-Format mpegvideo
-VideoBitRate 128
-VideoFrameRate 25
-#VideoSize    352x240
-VideoGopSize 25
-</Stream>
-
+#<Stream test2.mpg>
+#Feed feed1.ffm
+#Format mpegvideo
+#VideoBitRate 128
+#VideoFrameRate 25
+###VideoSize    352x240
+#VideoGopSize 25
+#NoAudio
+#</Stream>
+#
 ##################################################################
 # A stream coming from a file : you only need to set the input
 # filename and optionnally a new format. Supported conversions:
 #    avi -> asf
 #
 
-<Stream file.asf>
+# another file streaming
+<Stream file.rm>
 
-#File "/tmp/file.avi"
-File "tmp/file.avi"
-# avi must be converted to asf to be streamed
-Format asf
+File "/usr/local/httpd/htdocs/tlive.rm"
+NoAudio
 
 </Stream>
 
-# another file streaming
-<Stream file.mp3>
+<Stream file.asf>
 
-File "tmp/file.mp3"
+File "/usr/local/httpd/htdocs/test.asf"
+NoAudio
 
 </Stream>
 
@@ -154,86 +159,83 @@ Feed feed1.ffm
 Format rm
 AudioBitRate 32
 NoVideo
+NoAudio
 
 </Stream>
 
 ##################################################################
 # Another stream : Real with audio and video at 64 kbits
 
-<Stream test.rm>
+#<Stream test.rm>
 
-Feed feed1.ffm
-Format rm
+#Feed feed1.ffm
+#Format rm
 
-AudioBitRate 32
-VideoBitRate 20
-VideoFrameRate 2
-VideoIntraOnly
-
-</Stream>
+#AudioBitRate 32
+#VideoBitRate 128
+#VideoFrameRate 25
+#VideoGopSize 25
+#NoAudio
 
-##################################################################
-# Another stream : Mpeg audio layer 2 at 64 kbits.
+#</Stream>
 
-<Stream test.mp2>
+<Stream test2.rm>
 
 Feed feed1.ffm
-Format mp2
-AudioBitRate 64
-AudioSampleRate 44100
-
-</Stream>
-
-<Stream test1.mp2>
+Format rm
 
-Feed feed1.ffm
-Format mp2
-AudioBitRate 32
-AudioSampleRate 16000
+VideoBitRate 128
+VideoFrameRate 15
+VideoGopSize 25
+VideoSize    320x240
+AudioBitRate 64
 
 </Stream>
 
 ##################################################################
 # Another stream : Multipart JPEG
 
-<Stream test.mjpg>
-
-Feed feed1.ffm
-Format mpjpeg
-
-VideoFrameRate 2
-VideoIntraOnly
-
-</Stream>
+#<Stream test.mjpg>
+#
+#Feed feed1.ffm
+#Format mpjpeg
+#
+#VideoFrameRate 2
+#VideoIntraOnly
+#NoAudio
+#
+#</Stream>
 
 ##################################################################
 # Another stream : Multipart JPEG
 
-<Stream test.jpg>
-
-Feed feed1.ffm
-Format jpeg
-
-# the parameters are choose here to take the same output as the
-# Multipart JPEG one.
-VideoFrameRate 2 
-VideoIntraOnly
-#VideoSize 352x240
-
-</Stream>
+#<Stream test.jpg>
+#
+#Feed feed1.ffm
+#Format jpeg
+#
+## the parameters are choose here to take the same output as the
+## Multipart JPEG one.
+#VideoFrameRate 2 
+#VideoIntraOnly
+##VideoSize 352x240
+#NoAudio
+#
+#</Stream>
 
 ##################################################################
 # Another stream : Flash
 
-<Stream test.swf>
+#<Stream test.swf>
 
-Feed feed1.ffm
-Format swf
-
-VideoFrameRate 2
-VideoIntraOnly
-
-</Stream>
+#Feed feed1.ffm
+#Format swf
+#
+#VideoFrameRate 2
+#VideoIntraOnly
+#NoAudio
+#
+#</Stream>
 
 
 ##################################################################
@@ -243,11 +245,12 @@ VideoIntraOnly
 
 Feed feed1.ffm
 Format asf
-
+#
+VideoFrameRate 15
+VideoSize 352x240
+VideoBitRate 128
+VideoGopSize 30
 AudioBitRate 64
-AudioSampleRate 44100
-VideoFrameRate 2
-VideoIntraOnly
 
 </Stream>