aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-05-29 18:50:13 +0200
committerClément Bœsch <ubitux@gmail.com>2012-05-29 18:50:20 +0200
commitdae8505492748d619753b1949123a7ca3680cc3d (patch)
tree8e052d161c78e135f4deb6f4ab26022648c51fa5
parentad381ac97fadaab681075ef9331e917683805233 (diff)
downloadffmpeg-dae8505492748d619753b1949123a7ca3680cc3d.tar.gz
ffprobe: make -of an alias for -print_format.
This is for interoperability purpose with the fork.
-rw-r--r--doc/ffprobe.texi2
-rw-r--r--ffprobe.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 1f6566802c..a725c37676 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -80,7 +80,7 @@ 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{writer_name}[=@var{writer_options}]
+@item -of, -print_format @var{writer_name}[=@var{writer_options}]
Set the output printing format.
@var{writer_name} specifies the name of the writer, and
diff --git a/ffprobe.c b/ffprobe.c
index afc088320d..d86ff0bae0 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1904,6 +1904,7 @@ static const OptionDef options[] = {
"prettify the format of displayed values, make it more human readable" },
{ "print_format", OPT_STRING | HAS_ARG, {(void*)&print_format},
"set the output printing format (available formats are: default, compact, csv, ini, json, xml)", "format" },
+ { "of", OPT_STRING | HAS_ARG, {(void*)&print_format}, "alias for -print_format", "format" },
{ "show_error", OPT_BOOL, {(void*)&do_show_error} , "show probing error" },
{ "show_format", OPT_BOOL, {(void*)&do_show_format} , "show format/container info" },
{ "show_frames", OPT_BOOL, {(void*)&do_show_frames} , "show frames info" },