mpjpeg: Check stream allocation

[ffmpeg] / doc / avprobe.texi

diff --git a/doc/avprobe.texi b/doc/avprobe.texi
index a0497de8978e0a97d1846e8ba2f3093c63f70937..7e6fedf5c489baa42042af20b9f75347d6ed3956 100644 (file)
--- a/doc/avprobe.texi
+++ b/doc/avprobe.texi
@@ -41,26 +41,15 @@ Options are used to list some of the formats supported by avprobe or
 for specifying which information to display, and for setting how
 avprobe will show it.
 
-avprobe output is designed to be easily parsable by a textual filter,
-and consists of one or more sections of the form:
-@example
-[SECTION]
-key1=val1
-...
-keyN=valN
-[/SECTION]
-@end example
-
-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:".
+avprobe output is designed to be easily parsable by any INI or JSON
+parsers.
 
 @c man end
 
 @chapter Options
 @c man begin OPTIONS
 
-@include fftools-common-opts.texi
+@include avtools-common-opts.texi
 
 @section Main options
 
@@ -69,6 +58,19 @@ are prefixed by the string "TAG:".
 @item -f @var{format}
 Force format to use.
 
+@item -of @var{formatter}
+Use a specific formatter to output the document. The following
+formatters are available
+@table @option
+@item ini
+
+@item json
+
+@item old
+Pseudo-INI format that used to be the only one available in old
+avprobe versions.
+@end table
+
 @item -unit
 Show the unit of the displayed values.
 
@@ -94,6 +96,11 @@ stream.
 All the container format information is printed within a section with
 name "FORMAT".
 
+@item -show_format_entry @var{name}
+Like @option{-show_format}, but only prints the specified entry of the
+container format information, rather than all. This option may be given more
+than once, then all specified entries will be shown.
+
 @item -show_packets
 Show information about each packet contained in the input multimedia
 stream.
@@ -122,7 +129,7 @@ with name "STREAM".
 @settitle avprobe media prober
 
 @c man begin SEEALSO
-ffmpeg(1), avplay(1), avserver(1) and the Libav HTML documentation
+avconv(1), avplay(1) and the Libav HTML documentation
 @c man end
 
 @c man begin AUTHORS