summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-01-12 10:49:46 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-01-12 10:52:32 +0100
commitdf018207f90b4af121a7221361f20991f4e6b2ac (patch)
treec76f32049fa1518a8e374e52d9ad8d18e707f7ce /doc
parentcab85051c0f05f1533f28bb03979cc00147af6be (diff)
downloadffmpeg-streaming-df018207f90b4af121a7221361f20991f4e6b2ac.zip
ffmpeg-streaming-df018207f90b4af121a7221361f20991f4e6b2ac.tar.gz
doc/ffserver: remove paragraph in the introductory blurb
The paragraph is about what ffserver is not and where to look for other information, but is pretty redundant and distracting, especially considering the new organization of the documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver.texi5
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 0aa409f..83756b8 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -22,11 +22,6 @@ live feeds (you can seek to positions in the past on each live feed,
provided you specify a big enough feed storage in
@file{ffserver.conf}).
-This documentation covers only the streaming aspects of ffserver /
-ffmpeg. All questions about parameters for ffmpeg, codec questions,
-etc. are not covered here. Read @file{ffmpeg.html} for more
-information.
-
@command{ffserver} receives prerecorded files or FFM streams from some
@command{ffmpeg} instance as input, then streams them over
RTP/RTSP/HTTP.
OpenPOWER on IntegriCloud