From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 28 Nov 2013 16:07:19 +0000 (+0100)
Subject: doc/ffserver: specify default value for Preroll
X-Git-Tag: android-x86-6.0-r1~8713
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=398479050e56729a76bd15a18419a765e49cda23;p=android-x86%2Fexternal-ffmpeg.git

doc/ffserver: specify default value for Preroll
---

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index c0742c9292..d6371a245c 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -434,6 +434,8 @@ Set this to the number of seconds backwards in time to start. Note that
 most players will buffer 5-10 seconds of video, and also you need to allow
 for a keyframe to appear in the data stream.
 
+Default value is 0.
+
 @item ACL @var{spec}
 Set ACL for the stream.