From 3a50894eaaad3d5a7ec9bad99c08ecb8305c51c1 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 23 Apr 2011 16:40:01 +0200 Subject: Refer to ff* tools by their lowercase names. --- doc/ffserver.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doc/ffserver.texi') diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 021b237de5..e5c9d40235 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -22,12 +22,12 @@ ffserver [options] @chapter Description @c man begin DESCRIPTION -FFserver is a streaming server for both audio and video. It supports +ffserver is a streaming server for both audio and video. It supports several live feeds, streaming from files and time shifting on live feeds (you can seek to positions in the past on each live feed, provided you specify a big enough feed storage in ffserver.conf). -FFserver runs in daemon mode by default; that is, it puts itself in +ffserver runs in daemon mode by default; that is, it puts itself in the background and detaches from its TTY, unless it is launched in debug mode or a NoDaemon option is specified in the configuration file. @@ -39,7 +39,7 @@ information. @section How does it work? -FFserver receives prerecorded files or FFM streams from some ffmpeg +ffserver receives prerecorded files or FFM streams from some ffmpeg instance as input, then streams them over RTP/RTSP/HTTP. An ffserver instance will listen on some port as specified in the @@ -57,7 +57,7 @@ file. @section Status stream -FFserver supports an HTTP interface which exposes the current status +ffserver supports an HTTP interface which exposes the current status of the server. Simply point your browser to the address of the special status stream @@ -249,8 +249,8 @@ For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}. Use @file{configfile} instead of @file{/etc/ffserver.conf}. @item -n Enable no-launch mode. This option disables all the Launch directives -within the various sections. FFserver will not launch any -ffmpeg instance, so you will have to launch them manually. +within the various sections. Since ffserver will not launch +any ffmpeg instances, you will have to launch them manually. @item -d Enable debug mode. This option increases log verbosity, directs log messages to stdout and causes ffserver to run in the foreground -- cgit v1.2.3 From 89b503b55f2b2713f1c3cc8981102c1a7b663281 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 23 Apr 2011 15:19:17 +0200 Subject: Lowercase all ff* program names. --- doc/ffmpeg.texi | 6 +++--- doc/ffplay.texi | 4 ++-- doc/ffprobe.texi | 6 +++--- doc/ffserver.texi | 6 +++--- ffmpeg.c | 4 ++-- ffplay.c | 4 ++-- ffprobe.c | 4 ++-- ffserver.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'doc/ffserver.texi') diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 62282b2dd0..0d12f65f02 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle FFmpeg Documentation +@settitle ffmpeg Documentation @titlepage -@center @titlefont{FFmpeg Documentation} +@center @titlefont{ffmpeg Documentation} @end titlepage @top @@ -1046,7 +1046,7 @@ file to which you want to add them. @ignore @setfilename ffmpeg -@settitle FFmpeg video converter +@settitle ffmpeg video converter @c man begin SEEALSO ffplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 6199e6d269..e5de3d2d6d 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle FFplay Documentation +@settitle ffplay Documentation @titlepage -@center @titlefont{FFplay Documentation} +@center @titlefont{ffplay Documentation} @end titlepage @top diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 15090220f3..5e856e6645 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle FFprobe Documentation +@settitle ffprobe Documentation @titlepage -@center @titlefont{FFprobe Documentation} +@center @titlefont{ffprobe Documentation} @end titlepage @top @@ -119,7 +119,7 @@ with name "STREAM". @ignore @setfilename ffprobe -@settitle FFprobe media prober +@settitle ffprobe media prober @c man begin SEEALSO ffmpeg(1), ffplay(1), ffserver(1) and the Libav HTML documentation diff --git a/doc/ffserver.texi b/doc/ffserver.texi index e5c9d40235..d247016bbc 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle FFserver Documentation +@settitle ffserver Documentation @titlepage -@center @titlefont{FFserver Documentation} +@center @titlefont{ffserver Documentation} @end titlepage @top @@ -261,7 +261,7 @@ rather than as a daemon. @ignore @setfilename ffserver -@settitle FFserver video server +@settitle ffserver video server @c man begin SEEALSO diff --git a/ffmpeg.c b/ffmpeg.c index 886d5da7de..d54785d597 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1,5 +1,5 @@ /* - * FFmpeg main + * ffmpeg main * Copyright (c) 2000-2003 Fabrice Bellard * * This file is part of Libav. @@ -78,7 +78,7 @@ #include "libavutil/avassert.h" -const char program_name[] = "FFmpeg"; +const char program_name[] = "ffmpeg"; const int program_birth_year = 2000; /* select an input stream for an output stream */ diff --git a/ffplay.c b/ffplay.c index 766d5caf9c..18010ef076 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1,5 +1,5 @@ /* - * FFplay : Simple Media Player based on the Libav libraries + * ffplay : Simple Media Player based on the Libav libraries * Copyright (c) 2003 Fabrice Bellard * * This file is part of Libav. @@ -55,7 +55,7 @@ #include #include -const char program_name[] = "FFplay"; +const char program_name[] = "ffplay"; const int program_birth_year = 2003; //#define DEBUG diff --git a/ffprobe.c b/ffprobe.c index cc3699bf9b..6e26c115a7 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1,5 +1,5 @@ /* - * FFprobe : Simple Media Prober based on the Libav libraries + * ffprobe : Simple Media Prober based on the Libav libraries * Copyright (c) 2007-2010 Stefano Sabatini * * This file is part of Libav. @@ -28,7 +28,7 @@ #include "libavdevice/avdevice.h" #include "cmdutils.h" -const char program_name[] = "FFprobe"; +const char program_name[] = "ffprobe"; const int program_birth_year = 2007; static int do_show_format = 0; diff --git a/ffserver.c b/ffserver.c index 9cb65da017..829eb2ef7e 100644 --- a/ffserver.c +++ b/ffserver.c @@ -59,7 +59,7 @@ #include "cmdutils.h" -const char program_name[] = "FFserver"; +const char program_name[] = "ffserver"; const int program_birth_year = 2000; static const OptionDef options[]; -- cgit v1.2.3