summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-05-22 09:48:34 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2008-05-22 09:48:34 +0000
commit8117c97e12e2d72bb8147b83852e5d690dcc1ba2 (patch)
treebfb81143f7fec46ad4935afd9693d373b594349a
parent20176cbc737a4896f10d199d5c02ae13cc74d34b (diff)
Implement ffserver -version.
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13234 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffserver-doc.texi2
-rw-r--r--ffserver.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 4842af7b3f..4de2bf5bab 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -196,6 +196,8 @@ ffserver [options]
@section Options
@c man begin OPTIONS
@table @option
+@item -version
+Show version.
@item -L
Print the license.
@item -h
diff --git a/ffserver.c b/ffserver.c
index bc45a0e0e6..2a27fe8b0f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4349,6 +4349,7 @@ static void opt_show_help(void)
static const OptionDef options[] = {
{ "h", OPT_EXIT, {(void*)opt_show_help}, "show help" },
+ { "version", OPT_EXIT, {(void*)show_version}, "show version" },
{ "L", OPT_EXIT, {(void*)show_license}, "show license" },
{ "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
{ "d", 0, {(void*)opt_debug}, "enable debug mode" },