Factorize common options documentation.

Originally committed as revision 20907 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index f5c0e64..0734189 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -225,53 +225,7 @@ specified for the inputs.
 @section Main options
 
 @table @option
-@item -L
-Show license.
-
-@item -h, -?, -help, --help
-Show help.
-
-@item -version
-Show version.
-
-@item -formats
-Show available formats.
-
-The fields preceding the format names have the following meanings:
-@table @samp
-@item D
-Decoding available
-@item E
-Encoding available
-@end table
-
-@item -codecs
-Show available codecs.
-
-The fields preceding the codec names have the following meanings:
-@table @samp
-@item D
-Decoding available
-@item E
-Encoding available
-@item V/A/S
-Video/audio/subtitle codec
-@item S
-Codec supports slices
-@item D
-Codec supports direct rendering
-@item T
-Codec can handle input truncated at random locations instead of only at frame boundaries
-@end table
-
-@item -bsfs
-Show available bitstream filters.
-
-@item -protocols
-Show available protocols.
-
-@item -filters
-Show available libavfilter filters.
+@include fftools-common-opts.texi
 
 @item -f @var{fmt}
 Force format.
@@ -316,20 +270,6 @@ ffmpeg -i in.avi -metadata title="my title" out.flv
 @item -v @var{number}
 Set the logging verbosity level.
 
-@item -loglevel @var{loglevel}
-Set the logging level used by the library.
-@var{loglevel} is a number or a string containing one of the following values:
-@table @samp
-@item quiet
-@item panic
-@item fatal
-@item error
-@item warning
-@item info
-@item verbose
-@item debug
-@end table
-
 @item -target @var{type}
 Specify target file type ("vcd", "svcd", "dvd", "dv", "dv50", "pal-vcd",
 "ntsc-svcd", ... ). All the format options (bitrate, codecs,

diff --git a/doc/ffplay-doc.texi b/doc/ffplay-doc.texi
index a544d61..2b1df55 100644 (file)
--- a/doc/ffplay-doc.texi
+++ b/doc/ffplay-doc.texi
@@ -29,22 +29,7 @@ ffplay [options] @file{input_file}
 @section Main options
 
 @table @option
-@item -h, -?, -help, --help
-Show help.
-@item -version
-Show version.
-@item -L
-Show license.
-@item -formats
-Show available formats.
-@item -codecs
-Show available codecs.
-@item -bsfs
-Show available bitstream filters.
-@item -protocols
-Show available protocols.
-@item -filters
-Show available libavfilter filters.
+@include fftools-common-opts.texi
 @item -x @var{width}
 Force displayed width.
 @item -y @var{height}
@@ -64,20 +49,6 @@ Seek by bytes.
 Disable graphical display.
 @item -f @var{fmt}
 Force format.
-@item -loglevel @var{loglevel}
-Set the logging level used by the library.
-@var{loglevel} is a number or a string containing one of the following values:
-@table @samp
-@item quiet
-@item panic
-@item fatal
-@item error
-@item warning
-@item info
-@item verbose
-@item debug
-@end table
-@end table
 
 @section Advanced options
 @table @option

diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 8f0903f..444a8cd 100644 (file)
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -237,36 +237,7 @@ ffserver [options]
 @section Options
 @c man begin OPTIONS
 @table @option
-@item -version
-Show version.
-@item -L
-Show license.
-@item -formats
-Show available formats.
-@item -codecs
-Show available codecs.
-@item -bsfs
-Show available bitstream filters.
-@item -protocols
-Show available protocols.
-@item -filters
-Show available libavfilter filters.
-@item -h, -?, -help, --help
-Show help.
-@item -loglevel @var{loglevel}
-Set the logging level used by the library.
-@var{loglevel} is a number or a string containing one of the following values:
-@table @samp
-@item quiet
-@item panic
-@item fatal
-@item error
-@item warning
-@item info
-@item verbose
-@item debug
-@end table
-
+@include fftools-common-opts.texi
 @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
new file mode 100644 (file)
index 0000000..60b0500
--- /dev/null
+++ b/doc/fftools-common-opts.texi
@@ -0,0 +1,62 @@
+@item -L
+Show license.
+
+@item -h, -?, -help, --help
+Show help.
+
+@item -version
+Show version.
+
+@item -formats
+Show available formats.
+
+The fields preceding the format names have the following meanings:
+@table @samp
+@item D
+Decoding available
+@item E
+Encoding available
+@end table
+
+@item -codecs
+Show available codecs.
+
+The fields preceding the codec names have the following meanings:
+@table @samp
+@item D
+Decoding available
+@item E
+Encoding available
+@item V/A/S
+Video/audio/subtitle codec
+@item S
+Codec supports slices
+@item D
+Codec supports direct rendering
+@item T
+Codec can handle input truncated at random locations instead of only at frame boundaries
+@end table
+
+@item -bsfs
+Show available bitstream filters.
+
+@item -protocols
+Show available protocols.
+
+@item -filters
+Show available libavfilter filters.
+
+@item -loglevel @var{loglevel}
+Set the logging level used by the library.
+@var{loglevel} is a number or a string containing one of the following values:
+@table @samp
+@item quiet
+@item panic
+@item fatal
+@item error
+@item warning
+@item info
+@item verbose
+@item debug
+@end table
+