[FFmpeg-cvslog] r20907 - in trunk/doc: ffmpeg-doc.texi ffplay-doc.texi ffserver-doc.texi fftools-common-opts.texi

[stefano]

Author: stefano
Date: Mon Dec 21 22:32:09 2009
New Revision: 20907

Log:
Factorize common options documentation.

Added:
   trunk/doc/fftools-common-opts.texi
Modified:
   trunk/doc/ffmpeg-doc.texi
   trunk/doc/ffplay-doc.texi
   trunk/doc/ffserver-doc.texi

Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
+++ trunk/doc/ffmpeg-doc.texi	Mon Dec 21 22:32:09 2009	(r20907)
@@ -225,53 +225,7 @@ specified for the inputs.
 @section Main options
 
 @table @option
- at item -L
-Show license.
-
- at item -h, -?, -help, --help
-Show help.
-
- at item -version
-Show version.
-
- at item -formats
-Show available formats.
-
-The fields preceding the format names have the following meanings:
- at table @samp
- at item D
-Decoding available
- at item E
-Encoding available
- at end table
-
- at item -codecs
-Show available codecs.
-
-The fields preceding the codec names have the following meanings:
- at table @samp
- at item D
-Decoding available
- at item E
-Encoding available
- at item V/A/S
-Video/audio/subtitle codec
- at item S
-Codec supports slices
- at item D
-Codec supports direct rendering
- at item T
-Codec can handle input truncated at random locations instead of only at frame boundaries
- at end table
-
- at item -bsfs
-Show available bitstream filters.
-
- at item -protocols
-Show available protocols.
-
- at item -filters
-Show available libavfilter filters.
+ at include fftools-common-opts.texi
 
 @item -f @var{fmt}
 Force format.
@@ -316,20 +270,6 @@ ffmpeg -i in.avi -metadata title="my tit
 @item -v @var{number}
 Set the logging verbosity level.
 
- at item -loglevel @var{loglevel}
-Set the logging level used by the library.
- at var{loglevel} is a number or a string containing one of the following values:
- at table @samp
- at item quiet
- at item panic
- at item fatal
- at item error
- at item warning
- at item info
- at item verbose
- at item debug
- at 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,

Modified: trunk/doc/ffplay-doc.texi
==============================================================================
--- trunk/doc/ffplay-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
+++ trunk/doc/ffplay-doc.texi	Mon Dec 21 22:32:09 2009	(r20907)
@@ -29,22 +29,7 @@ ffplay [options] @file{input_file}
 @section Main options
 
 @table @option
- at item -h, -?, -help, --help
-Show help.
- at item -version
-Show version.
- at item -L
-Show license.
- at item -formats
-Show available formats.
- at item -codecs
-Show available codecs.
- at item -bsfs
-Show available bitstream filters.
- at item -protocols
-Show available protocols.
- at item -filters
-Show available libavfilter filters.
+ at 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.
- at item -loglevel @var{loglevel}
-Set the logging level used by the library.
- at var{loglevel} is a number or a string containing one of the following values:
- at table @samp
- at item quiet
- at item panic
- at item fatal
- at item error
- at item warning
- at item info
- at item verbose
- at item debug
- at end table
- at end table
 
 @section Advanced options
 @table @option

Modified: trunk/doc/ffserver-doc.texi
==============================================================================
--- trunk/doc/ffserver-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
+++ trunk/doc/ffserver-doc.texi	Mon Dec 21 22:32:09 2009	(r20907)
@@ -237,36 +237,7 @@ ffserver [options]
 @section Options
 @c man begin OPTIONS
 @table @option
- at item -version
-Show version.
- at item -L
-Show license.
- at item -formats
-Show available formats.
- at item -codecs
-Show available codecs.
- at item -bsfs
-Show available bitstream filters.
- at item -protocols
-Show available protocols.
- at item -filters
-Show available libavfilter filters.
- at item -h, -?, -help, --help
-Show help.
- at item -loglevel @var{loglevel}
-Set the logging level used by the library.
- at var{loglevel} is a number or a string containing one of the following values:
- at table @samp
- at item quiet
- at item panic
- at item fatal
- at item error
- at item warning
- at item info
- at item verbose
- at item debug
- at end table
-
+ at include fftools-common-opts.texi
 @item -f @var{configfile}
 Use @file{configfile} instead of @file{/etc/ffserver.conf}.
 @item -n

Added: trunk/doc/fftools-common-opts.texi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/doc/fftools-common-opts.texi	Mon Dec 21 22:32:09 2009	(r20907)
@@ -0,0 +1,62 @@
+ at item -L
+Show license.
+
+ at item -h, -?, -help, --help
+Show help.
+
+ at item -version
+Show version.
+
+ at item -formats
+Show available formats.
+
+The fields preceding the format names have the following meanings:
+ at table @samp
+ at item D
+Decoding available
+ at item E
+Encoding available
+ at end table
+
+ at item -codecs
+Show available codecs.
+
+The fields preceding the codec names have the following meanings:
+ at table @samp
+ at item D
+Decoding available
+ at item E
+Encoding available
+ at item V/A/S
+Video/audio/subtitle codec
+ at item S
+Codec supports slices
+ at item D
+Codec supports direct rendering
+ at item T
+Codec can handle input truncated at random locations instead of only at frame boundaries
+ at end table
+
+ at item -bsfs
+Show available bitstream filters.
+
+ at item -protocols
+Show available protocols.
+
+ at item -filters
+Show available libavfilter filters.
+
+ at item -loglevel @var{loglevel}
+Set the logging level used by the library.
+ at var{loglevel} is a number or a string containing one of the following values:
+ at table @samp
+ at item quiet
+ at item panic
+ at item fatal
+ at item error
+ at item warning
+ at item info
+ at item verbose
+ at item debug
+ at end table
+