From f346033e9d7135fddc6cc4f507d8ade846d22168 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Fri, 23 May 2008 07:14:28 +0000
Subject: Add -formats option to ffserver. Patch by Stefano Sabatini stefano
 sabatini-lala poste it

Originally committed as revision 13245 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffserver-doc.texi | 2 ++
 ffserver.c            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 4de2bf5bab..589e58fca8 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -200,6 +200,8 @@ ffserver [options]
 Show version.
 @item -L
 Print the license.
+@item -formats
+Show available formats, codecs, protocols, ...
 @item -h
 Print the help.
 @item -f @var{configfile}
diff --git a/ffserver.c b/ffserver.c
index 2a27fe8b0f..986bd694ab 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4351,6 +4351,7 @@ 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" },
+    { "formats", OPT_EXIT, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
     { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
     { "d", 0, {(void*)opt_debug}, "enable debug mode" },
     { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" },
-- 
cgit v1.2.3