[SCM] libav/experimental: Implement ffserver -version. Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8117c97e12e2d72bb8147b83852e5d690dcc1ba2
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu May 22 09:48:34 2008 +0000

    Implement ffserver -version.
    Patch by: Stefano Sabatini, stefano.sabatini-lala poste it
    
    Originally committed as revision 13234 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 4842af7..4de2bf5 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
+ at item -version
+Show version.
 @item -L
 Print the license.
 @item -h
diff --git a/ffserver.c b/ffserver.c
index bc45a0e..2a27fe8 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" },

-- 
Libav/FFmpeg packaging