Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffprobe.texi

diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 079cf659d784794b383bc8b9fbe723845bb9c0d5..a5d5df8da82ab0203c1382aa6ce91bb1fa66d581 100644 (file)
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -60,7 +60,7 @@ are prefixed by the string "TAG:".
 @chapter Options
 @c man begin OPTIONS
 
-@include fftools-common-opts.texi
+@include avtools-common-opts.texi
 
 @section Main options
 
@@ -87,6 +87,10 @@ Use sexagesimal format HH:MM:SS.MICROSECONDS for time values.
 Prettify the format of the displayed values, it corresponds to the
 options "-unit -prefix -byte_binary_prefix -sexagesimal".
 
+@item -print_format @var{format}
+Set the output printing format.
+Current available formats are "default" and "json".
+
 @item -show_format
 Show information about the container format of the input multimedia
 stream.
@@ -108,11 +112,14 @@ multimedia stream.
 Each media stream information is printed within a dedicated section
 with name "STREAM".
 
+@item -i @var{input_file}
+Read @var{input_file}.
+
 @end table
 @c man end
 
+@include decoders.texi
 @include demuxers.texi
-@include muxers.texi
 @include protocols.texi
 @include indevs.texi
 
@@ -122,11 +129,11 @@ with name "STREAM".
 @settitle ffprobe media prober
 
 @c man begin SEEALSO
-ffmpeg(1), avplay(1), ffserver(1) and the Libav HTML documentation
+ffmpeg(1), ffplay(1), ffserver(1) and the FFmpeg HTML documentation
 @c man end
 
 @c man begin AUTHORS
-The Libav developers
+The FFmpeg developers
 @c man end
 
 @end ignore