From df018207f90b4af121a7221361f20991f4e6b2ac Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 12 Jan 2013 10:49:46 +0100 Subject: [PATCH] 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. --- doc/ffserver.texi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 0aa409f403..83756b86c5 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.