Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-09-19 13:23:11 +0400
committerStefano Sabatini <stefasab@gmail.com>2012-09-19 13:50:05 +0400
commitf398617b197d9a44b27d3313df8cd6c72b6a168a (patch)
tree31a2ee72f68d2643d9fdd4fdedf8719bbe7b092a /doc/ffprobe.texi
parentd0c6ac0debaff1ca32be71cbbf958698106c3c4f (diff)
ffprobe: fix CSV writer output
Fix regression introduced in 749ddc14fc9ebcef09965dfd98c8bf2505dc3b58.
Diffstat (limited to 'doc/ffprobe.texi')
-rw-r--r--doc/ffprobe.texi21
1 files changed, 10 insertions, 11 deletions
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 19b32ee1b1..6809a99ef7 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -218,8 +218,11 @@ If set to 1 specify not to print the section header and footer.
Default value is 0.
@end table
-@section compact
-Compact format.
+@section compact, csv
+Compact and CSV format.
+
+The @code{csv} writer is equivalent to @code{compact}, but supports
+different defaults.
Each section is printed on a single line.
If no option is specifid, the output has the form:
@@ -240,14 +243,16 @@ The description of the accepted options follows.
@item item_sep, s
Specify the character to use for separating fields in the output line.
-It must be a single printable character, it is "|" by default.
+It must be a single printable character, it is "|" by default ("," for
+the @code{csv} writer).
@item nokey, nk
If set to 1 specify not to print the key of each field. Its default
-value is 0.
+value is 0 (1 for the @code{csv} writer).
@item escape, e
-Set the escape mode to use, default to "c".
+Set the escape mode to use, default to "c" ("csv" for the @code{csv}
+writer).
It can assume one of the following values:
@table @option
@@ -275,12 +280,6 @@ Print the section name at the begin of each line if the value is
@end table
-@section csv
-CSV format.
-
-This writer is equivalent to
-@code{compact=item_sep=,:nokey=1:escape=csv}.
-
@section flat
Flat format.