[FFmpeg-cvslog] ffprobe: create a dedicated "Writers" section in the manual

Stefano Sabatini git at videolan.org
Sun Oct 9 16:12:46 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sun Oct  2 11:59:38 2011 +0200| [9806dda8a8b707b90c10074f0b5bfd54b7c6a97e] | committer: Stefano Sabatini

ffprobe: create a dedicated "Writers" section in the manual

Also update documentation related to the output format.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9806dda8a8b707b90c10074f0b5bfd54b7c6a97e
---

 doc/ffprobe.texi |   57 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index a5d5df8..597b6b5 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -42,18 +42,11 @@ for specifying which information to display, and for setting how
 ffprobe will show it.
 
 ffprobe output is designed to be easily parsable by a textual filter,
-and consists of one or more sections of the form:
- at example
-[SECTION]
-key1=val1
-...
-keyN=valN
-[/SECTION]
- at end example
+and consists of one or more sections of a form defined by the selected
+writer, which is specified by the @option{print_format} option.
 
 Metadata tags stored in the container or in the streams are recognized
-and printed in the corresponding "FORMAT" or "STREAM" section, and
-are prefixed by the string "TAG:".
+and printed in the corresponding "FORMAT" or "STREAM" section.
 
 @c man end
 
@@ -89,7 +82,14 @@ options "-unit -prefix -byte_binary_prefix -sexagesimal".
 
 @item -print_format @var{format}
 Set the output printing format.
-Current available formats are "default" and "json".
+
+For example for printing the output in JSON format, specify:
+ at example
+-print_format json
+ at end example
+
+For more details on the available output printing formats, see the
+Writers section below.
 
 @item -show_format
 Show information about the container format of the input multimedia
@@ -118,6 +118,41 @@ Read @var{input_file}.
 @end table
 @c man end
 
+ at chapter Writers
+ at c man begin WRITERS
+
+A writer defines the output format adopted by @file{ffprobe}, and will be
+used for printing all the parts of the output.
+
+A writer may accept one or more arguments, which specify the options to
+adopt.
+
+A description of the currently available writers follows.
+
+ at section default
+Default format.
+
+Print each section in the form:
+ at example
+[SECTION]
+key1=val1
+...
+keyN=valN
+[/SECTION]
+ at end example
+
+Metadata tags are printed as a line in the corresponding FORMAT or
+STREAM section, and are prefixed by the string "TAG:".
+
+ at section json
+JSON based format.
+
+Each section is printed using JSON notation.
+
+For more information about JSON, see @url{http://www.json.org/}.
+
+ at c man end WRITERS
+
 @include decoders.texi
 @include demuxers.texi
 @include protocols.texi



More information about the ffmpeg-cvslog mailing list