summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-06-08 09:55:30 +0000
committerHoward Chu <hyc@highlandsun.com>2010-06-08 09:55:30 +0000
commit8190f62f9b21b5013e2ce47073244b199482dd58 (patch)
tree9b05663f28af63e42ab9adfbfd73a4ed1efcc720 /doc
parent0933f55829f63485ae967a08c8f7b2c2a77ee1af (diff)
Support presets in ffserver.conf
Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver.conf21
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 2fbfecd683..217117005c 100644
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -306,6 +306,27 @@ StartSendOnKey
#</Stream>
+# Transcode an incoming live feed to another live feed,
+# using libx264 and video presets
+
+#<Stream live.h264>
+#Format rtp
+#Feed feed1.ffm
+#VideoCodec libx264
+#VideoFrameRate 24
+#VideoBitRate 100
+#VideoSize 480x272
+#AVPresetVideo default
+#AVPresetVideo baseline
+#AVOptionVideo flags +global_header
+#
+#AudioCodec libfaac
+#AudioBitRate 32
+#AudioChannels 2
+#AudioSampleRate 22050
+#AVOptionAudio flags +global_header
+#</Stream>
+
##################################################################
# SDP/multicast examples
#