From 8190f62f9b21b5013e2ce47073244b199482dd58 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@highlandsun.com>
Date: Tue, 8 Jun 2010 09:55:30 +0000
Subject: Support presets in ffserver.conf

Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffserver.conf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'doc/ffserver.conf')

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
 #
-- 
cgit v1.2.1