[FFmpeg-cvslog] r21934 - in trunk/doc: ffmpeg-doc.texi ffplay-doc.texi ffserver-doc.texi fftools-common-opts.texi
stefano
subversion
Sun Feb 21 11:56:38 CET 2010
Author: stefano
Date: Sun Feb 21 11:56:38 2010
New Revision: 21934
Log:
Put all the options shared amongst the ff* tools under a dedicated
section "Generic options".
Modified:
trunk/doc/ffmpeg-doc.texi
trunk/doc/ffplay-doc.texi
trunk/doc/ffserver-doc.texi
trunk/doc/fftools-common-opts.texi
Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi Sun Feb 21 04:23:30 2010 (r21933)
+++ trunk/doc/ffmpeg-doc.texi Sun Feb 21 11:56:38 2010 (r21934)
@@ -222,10 +222,12 @@ specified for the inputs.
@c man end
@c man begin OPTIONS
+
+ at include fftools-common-opts.texi
+
@section Main options
@table @option
- at include fftools-common-opts.texi
@item -f @var{fmt}
Force format.
Modified: trunk/doc/ffplay-doc.texi
==============================================================================
--- trunk/doc/ffplay-doc.texi Sun Feb 21 04:23:30 2010 (r21933)
+++ trunk/doc/ffplay-doc.texi Sun Feb 21 11:56:38 2010 (r21934)
@@ -26,10 +26,12 @@ ffplay [options] @file{input_file}
@end example
@c man begin OPTIONS
+
+ at include fftools-common-opts.texi
+
@section Main options
@table @option
- at include fftools-common-opts.texi
@item -x @var{width}
Force displayed width.
@item -y @var{height}
Modified: trunk/doc/ffserver-doc.texi
==============================================================================
--- trunk/doc/ffserver-doc.texi Sun Feb 21 04:23:30 2010 (r21933)
+++ trunk/doc/ffserver-doc.texi Sun Feb 21 11:56:38 2010 (r21934)
@@ -236,8 +236,10 @@ ffserver [options]
@section Options
@c man begin OPTIONS
- at table @option
+
@include fftools-common-opts.texi
+
+ at table @option
@item -f @var{configfile}
Use @file{configfile} instead of @file{/etc/ffserver.conf}.
@item -n
Modified: trunk/doc/fftools-common-opts.texi
==============================================================================
--- trunk/doc/fftools-common-opts.texi Sun Feb 21 04:23:30 2010 (r21933)
+++ trunk/doc/fftools-common-opts.texi Sun Feb 21 11:56:38 2010 (r21934)
@@ -1,3 +1,9 @@
+ at section Generic options
+
+These options are shared amongst the ff* tools.
+
+ at table @option
+
@item -L
Show license.
@@ -63,3 +69,4 @@ Set the logging level used by the librar
@item debug
@end table
+ at end table
More information about the ffmpeg-cvslog
mailing list