[SCM] libav/experimental: Put all the options shared amongst the ff* tools under a dedicated section "Generic options".
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:00:47 UTC 2013
The following commit has been merged in the experimental branch:
commit 8b9da8b50ab88d84bbf56338f7c952a3b6941f47
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sun Feb 21 10:56:38 2010 +0000
Put all the options shared amongst the ff* tools under a dedicated
section "Generic options".
Originally committed as revision 21934 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 14c4176..b3de32a 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -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.
diff --git a/doc/ffplay-doc.texi b/doc/ffplay-doc.texi
index e098259..f2f0d53 100644
--- a/doc/ffplay-doc.texi
+++ b/doc/ffplay-doc.texi
@@ -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}
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 444a8cd..9c33e41 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -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
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index ce8a4d6..4fc271d 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -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 library.
@item debug
@end table
+ at end table
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list