[Ffmpeg-cvslog] CVS: ffmpeg/doc TODO, 1.27, 1.28 faq.texi, 1.26, 1.27 ffmpeg-doc.texi, 1.99, 1.100 ffmpeg_powerpc_performance_evaluation_howto.txt, 1.5, 1.6 ffplay-doc.texi, 1.3, 1.4 ffserver-doc.texi, 1.7, 1.8 ffserver.conf, 1.25, 1.26 hooks.texi, 1.2, 1.3 texi2pod.pl, 1.1, 1.2

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/doc
In directory mail:/var2/tmp/cvs-serv18206/doc

Modified Files:
	TODO faq.texi ffmpeg-doc.texi 
	ffmpeg_powerpc_performance_evaluation_howto.txt 
	ffplay-doc.texi ffserver-doc.texi ffserver.conf hooks.texi 
	texi2pod.pl 
Log Message:
COSMETICS: Remove all trailing whitespace.


Index: TODO
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/TODO,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- TODO	5 Jun 2004 02:51:52 -0000	1.27
+++ TODO	17 Dec 2005 18:14:26 -0000	1.28
@@ -5,13 +5,13 @@
 -------------------
 Short term:
 
-- av_read_frame() API 
+- av_read_frame() API
 - seeking API and example in ffplay
 - parse_only mode
 - use AVFMTCTX_DISCARD_PKT in ffplay so that DV has a chance to work
 - add RTSP regression test (both client and server)
 - make ffserver allocate AVFormatContext
-- clean up (incompatible change, for 0.5.0): 
+- clean up (incompatible change, for 0.5.0):
     * AVStream -> AVComponent
     * AVFormatContext -> AVInputStream/AVOutputStream
     * suppress rate_emu from AVCodecContext
@@ -54,7 +54,7 @@
 Philip'a TODO list: (alphabetically ordered) (please help)
 ------------------
 - Add a multi-ffm filetype so that feeds can be recorded into multiple files rather
-  than one big file. 
+  than one big file.
 - Authenticated users support -- where the authentication is in the URL
 - Change ASF files so that the embedded timestamp in the frames is right rather
   than being an offset from the start of the stream

Index: faq.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/faq.texi,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- faq.texi	2 Dec 2005 15:25:10 -0000	1.26
+++ faq.texi	17 Dec 2005 18:14:26 -0000	1.27
@@ -53,7 +53,7 @@
 @section Why does ffmpeg not decode audio in VOB files ?
 
 The audio is AC3 (a.k.a. A/52). AC3 decoding is an optional component in ffmpeg
-as the component that handles AC3 decoding (liba52) is currently released under 
+as the component that handles AC3 decoding (liba52) is currently released under
 the GPL. If you have liba52 installed on your system, enable AC3 decoding
 with @code{./configure --enable-a52}. Take care: by
 enabling AC3, you automatically change the license of libavcodec from
@@ -61,7 +61,7 @@
 
 @section Which codecs are supported by Windows ?
 
-Windows does not support standard formats like MPEG very well, unless you 
+Windows does not support standard formats like MPEG very well, unless you
 install some additional codecs
 
 The following list of video codecs should work on most Windows systems:
@@ -79,8 +79,8 @@
 @item mpeg1
 .mpg only
 @end table
-Note, ASF files often have .wmv or .wma extensions in Windows. It should also 
-be mentioned that Microsoft claims a patent on the ASF format, and may sue 
+Note, ASF files often have .wmv or .wma extensions in Windows. It should also
+be mentioned that Microsoft claims a patent on the ASF format, and may sue
 or threaten users who create ASF files with non-Microsoft software. It is
 strongly advised to avoid ASF where possible.
 
@@ -95,7 +95,7 @@
 
 @section Why does the chrominance data seem to be sampled at a different time from the luminance data on bt8x8 captures on Linux?
 
-This is a well-known bug in the bt8x8 driver. For 2.4.26 there is a patch at 
+This is a well-known bug in the bt8x8 driver. For 2.4.26 there is a patch at
 (@url{http://www.mplayerhq.hu/~michael/bttv-420-2.4.26.patch}). This may also
 apply cleanly to other 2.4-series kernels.
 
@@ -132,8 +132,8 @@
 standard (note that there are many other coding formats that use this
 same standard). Thus, use '-vcodec mpeg4' to encode these formats. The
 default fourcc stored in an MPEG-4-coded file will be 'FMP4'. If you want
-a different fourcc, use the '-vtag' option. E.g., '-vtag xvid' will 
-force the fourcc 'xvid' to be stored as the video fourcc rather than the 
+a different fourcc, use the '-vtag' option. E.g., '-vtag xvid' will
+force the fourcc 'xvid' to be stored as the video fourcc rather than the
 default.
 
 @chapter Development
@@ -149,7 +149,7 @@
 @section Are there examples illustrating how to use the FFmpeg libraries, particularly libavcodec and libavformat ?
 
 Yes. Read the Developers Guide of the FFmpeg documentation. Alternatively,
-examine the source code for one of the many open source projects that 
+examine the source code for one of the many open source projects that
 already incorporate ffmpeg at (@url{projects.php}).
 
 @section Can you support my C compiler XXX ?
@@ -174,7 +174,7 @@
 @section Why not rewrite ffmpeg in object-oriented C++ ?
 
 ffmpeg is already organized in a highly modular manner and does not need to
-be rewritten in a formal object language. Further, many of the developers 
+be rewritten in a formal object language. Further, many of the developers
 favor straight C; it works for them. For more arguments on this matter,
 read "Programming Religion" at (@url{http://lkml.org/faq/lkmlfaq-15.html}).
 

Index: ffmpeg-doc.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- ffmpeg-doc.texi	12 Dec 2005 00:48:42 -0000	1.99
+++ ffmpeg-doc.texi	17 Dec 2005 18:14:26 -0000	1.100
@@ -12,7 +12,7 @@
 
 FFmpeg is a very fast video and audio converter. It can also grab from
 a live audio/video source.
-  
+
 The command line interface is designed to be intuitive, in the sense
 that FFmpeg tries to figure out all parameters that can possibly be
 derived automatically. You usually only have to specify the target
@@ -30,7 +30,7 @@
 System audio source:
 
 @example
-ffmpeg /tmp/out.mpg 
+ffmpeg /tmp/out.mpg
 @end example
 
 Note that you must activate the right video source and channel before
@@ -48,10 +48,10 @@
 * You can use YUV files as input:
 
 @example
-ffmpeg -i /tmp/test%d.Y /tmp/out.mpg 
+ffmpeg -i /tmp/test%d.Y /tmp/out.mpg
 @end example
 
-It will use the files: 
+It will use the files:
 @example
 /tmp/test0.Y, /tmp/test0.U, /tmp/test0.V,
 /tmp/test1.Y, /tmp/test1.U, /tmp/test1.V, etc...
@@ -130,7 +130,7 @@
 
 The generic syntax is:
 
- at example 
+ at example
 @c man begin SYNOPSIS
 ffmpeg [[infile options][@option{-i} @var{infile}]]... @{[outfile options] @var{outfile}@}...
 @c man end
@@ -161,16 +161,16 @@
 @item -formats
 Show available formats, codecs, protocols, ...
 
- at item -f fmt              
+ at item -f fmt
 Force format.
 
- at item -i filename         
+ at item -i filename
 input filename
 
- at item -y                  
+ at item -y
 Overwrite output files.
 
- at item -t duration         
+ at item -t duration
 Set the recording time in seconds.
 @code{hh:mm:ss[.xxx]} syntax is also supported.
 
@@ -178,16 +178,16 @@
 Seek to given time position in seconds.
 @code{hh:mm:ss[.xxx]} syntax is also supported.
 
- at item -title string       
+ at item -title string
 Set the title.
 
- at item -author string      
+ at item -author string
 Set the author.
 
- at item -copyright string   
+ at item -copyright string
 Set the copyright.
 
- at item -comment string     
+ at item -comment string
 Set the comment.
 
 @item -target type
@@ -224,9 +224,9 @@
 @table @option
 @item -b bitrate
 Set the video bitrate in kbit/s (default = 200 kb/s).
- at item -r fps           
+ at item -r fps
 Set frame rate (default = 25).
- at item -s size             
+ at item -s size
 Set frame size. The format is @samp{wxh} (default = 160x128).
 The following abbreviations are recognized:
 @table @samp
@@ -265,7 +265,7 @@
 blue (default = 000000 (black)).
 @item -vn
 Disable video recording.
- at item -bt tolerance       
+ at item -bt tolerance
 Set video bitrate tolerance (in kbit/s).
 @item -maxrate bitrate
 Set max video bitrate tolerance (in kbit/s).
@@ -273,19 +273,19 @@
 Set min video bitrate tolerance (in kbit/s).
 @item -bufsize size
 Set rate control buffer size (in kbit).
- at item -vcodec codec       
+ at item -vcodec codec
 Force video codec to @var{codec}. Use the @code{copy} special value to
 tell that the raw codec data must be copied as is.
 @item -sameq
 Use same video quality as source (implies VBR).
 
- at item -pass n  
+ at item -pass n
 Select the pass number (1 or 2). It is useful to do two pass
 encoding. The statistics of the video are recorded in the first
 pass and the video is generated at the exact requested bitrate
 in the second pass.
 
- at item -passlogfile file   
+ at item -passlogfile file
 Set two pass logfile name to @var{file}.
 
 @end table
@@ -293,21 +293,21 @@
 @section Advanced Video Options
 
 @table @option
- at item -g gop_size         
+ at item -g gop_size
 Set the group of pictures size.
- at item -intra              
+ at item -intra
 Use only intra frames.
- at item -qscale q           
+ at item -qscale q
 Use fixed video quantiser scale (VBR).
- at item -qmin q             
+ at item -qmin q
 minimum video quantiser scale (VBR)
- at item -qmax q             
+ at item -qmax q
 maximum video quantiser scale (VBR)
- at item -qdiff q            
+ at item -qdiff q
 maximum difference between the quantiser scales (VBR)
- at item -qblur blur         
+ at item -qblur blur
 video quantiser scale blur (VBR)
- at item -qcomp compression  
+ at item -qcomp compression
 video quantiser scale compression (VBR)
 
 @item -rc_init_cplx complexity
@@ -363,31 +363,31 @@
 @item 0
 FF_IDCT_AUTO (default)
 @item 1
-FF_IDCT_INT          
+FF_IDCT_INT
 @item 2
-FF_IDCT_SIMPLE       
+FF_IDCT_SIMPLE
 @item 3
-FF_IDCT_SIMPLEMMX    
+FF_IDCT_SIMPLEMMX
 @item 4
-FF_IDCT_LIBMPEG2MMX  
+FF_IDCT_LIBMPEG2MMX
 @item 5
-FF_IDCT_PS2          
+FF_IDCT_PS2
 @item 6
-FF_IDCT_MLIB         
+FF_IDCT_MLIB
 @item 7
-FF_IDCT_ARM          
+FF_IDCT_ARM
 @item 8
-FF_IDCT_ALTIVEC      
+FF_IDCT_ALTIVEC
 @item 9
-FF_IDCT_SH4          
+FF_IDCT_SH4
 @item 10
-FF_IDCT_SIMPLEARM    
+FF_IDCT_SIMPLEARM
 @end table
 
 @item -er n
 Set error resilience to @var{n}.
 @table @samp
- at item 1 
+ at item 1
 FF_ER_CAREFUL (default)
 @item 2
 FF_ER_COMPLIANT
@@ -453,9 +453,9 @@
 @section Audio Options
 
 @table @option
- at item -ar freq    
+ at item -ar freq
 Set the audio sampling frequency (default = 44100 Hz).
- at item -ab bitrate 
+ at item -ab bitrate
 Set the audio bitrate in kbit/s (default = 64).
 @item -ac channels
 Set the number of audio channels (default = 1).
@@ -484,13 +484,13 @@
 @section Advanced options
 
 @table @option
- at item -map file:stream    
+ at item -map file:stream
 Set input stream mapping.
 @item -debug
 Print specific debug info.
- at item -benchmark          
+ at item -benchmark
 Add timings for benchmarking.
- at item -hex                
+ at item -hex
 Dump each input packet.
 @item -bitexact
 Only use bit exact algorithms (for codec testing).
@@ -510,7 +510,7 @@
 @section FFmpeg formula evaluator
 
 When evaluating a rate control string, FFmpeg uses an internal formula
-evaluator. 
+evaluator.
 
 The following binary operators are available: @code{+}, @code{-},
 @code{*}, @code{/}, @code{^}.
@@ -650,26 +650,26 @@
 @tab also known as @code{VOB} file
 @item MPEG-2 TS @tab    @tab  X
 @tab also known as DVB Transport Stream
- at item ASF at tab X @tab X 
- at item AVI at tab X @tab X 
- at item WAV at tab X @tab X 
+ at item ASF at tab X @tab X
+ at item AVI at tab X @tab X
+ at item WAV at tab X @tab X
 @item Macromedia Flash at tab X @tab X
 @tab Only embedded audio is decoded.
 @item FLV              @tab  X @tab X
 @tab Macromedia Flash video files
- at item Real Audio and Video @tab X @tab X 
- at item Raw AC3 @tab X  @tab  X 
- at item Raw MJPEG @tab X  @tab  X 
- at item Raw MPEG video @tab X  @tab  X 
- at item Raw PCM8/16 bits, mulaw/Alaw at tab X  @tab  X 
- at item Raw CRI ADX audio @tab X  @tab  X 
- at item Raw Shorten audio @tab    @tab  X 
- at item SUN AU format @tab X  @tab  X 
+ at item Real Audio and Video @tab X @tab X
+ at item Raw AC3 @tab X  @tab  X
+ at item Raw MJPEG @tab X  @tab  X
+ at item Raw MPEG video @tab X  @tab  X
+ at item Raw PCM8/16 bits, mulaw/Alaw at tab X  @tab  X
+ at item Raw CRI ADX audio @tab X  @tab  X
+ at item Raw Shorten audio @tab    @tab  X
+ at item SUN AU format @tab X  @tab  X
 @item NUT @tab X @tab X @tab NUT Open Container Format
- at item QuickTime        @tab X @tab  X 
+ at item QuickTime        @tab X @tab  X
 @item MPEG-4           @tab X @tab  X
 @tab MPEG-4 is a variant of QuickTime.
- at item Raw MPEG4 video  @tab  X @tab  X 
+ at item Raw MPEG4 video  @tab  X @tab  X
 @item DV               @tab  X @tab  X
 @item 4xm              @tab    @tab X
 @tab 4X Technologies format, used in some games.
@@ -707,7 +707,7 @@
 
 @multitable @columnfractions .4 .1 .1 .4
 @item Supported Image Format @tab Encoding @tab Decoding @tab Comments
- at item PGM, PPM     @tab X @tab X 
+ at item PGM, PPM     @tab X @tab X
 @item PAM          @tab X @tab X @tab PAM is a PNM extension with alpha support.
 @item PGMYUV       @tab X @tab X @tab PGM with U and V components in YUV 4:2:0
 @item JPEG         @tab X @tab X @tab Progressive JPEG is not supported.
@@ -734,11 +734,11 @@
 @item H.261                  @tab  X  @tab  X
 @item H.263(+)               @tab  X  @tab  X @tab also known as RealVideo 1.0
 @item H.264                  @tab     @tab  X
- at item MJPEG                  @tab  X  @tab  X 
+ at item MJPEG                  @tab  X  @tab  X
 @item lossless MJPEG         @tab  X  @tab  X
 @item Apple MJPEG-B          @tab     @tab  X
 @item Sunplus MJPEG          @tab     @tab  X @tab fourcc: SP5X
- at item DV                     @tab  X  @tab  X 
+ at item DV                     @tab  X  @tab  X
 @item HuffYUV                @tab  X  @tab  X
 @item FFmpeg Video 1         @tab  X  @tab  X @tab experimental lossless codec (fourcc: FFV1)
 @item FFmpeg Snow            @tab  X  @tab  X @tab experimental wavelet codec (fourcc: SNOW)
@@ -755,7 +755,7 @@
 @item ATI VCR2               @tab     @tab  X @tab fourcc: VCR2
 @item Cirrus Logic AccuPak   @tab     @tab  X @tab fourcc: CLJR
 @item 4X Video               @tab     @tab  X @tab Used in certain computer games.
- at item Sony Playstation MDEC  @tab     @tab  X 
+ at item Sony Playstation MDEC  @tab     @tab  X
 @item Id RoQ                 @tab     @tab  X @tab Used in Quake III, Jedi Knight 2, other computer games.
 @item Xan/WC3                @tab     @tab  X @tab Used in Wing Commander III .MVE files.
 @item Interplay Video        @tab     @tab  X @tab Used in Interplay .MVE files.
@@ -779,10 +779,10 @@
 @item IBM Ultimotion         @tab     @tab  X @tab fourcc: ULTI
 @item Miro VideoXL           @tab     @tab  X @tab fourcc: VIXL
 @item QPEG                   @tab     @tab  X @tab fourccs: QPEG, Q1.0, Q1.1
- at item LOCO                   @tab     @tab  X @tab 
- at item Winnov WNV1            @tab     @tab  X @tab 
+ at item LOCO                   @tab     @tab  X @tab
+ at item Winnov WNV1            @tab     @tab  X @tab
 @item Autodesk Animator Studio Codec  @tab     @tab  X @tab fourcc: AASC
- at item Fraps FPS1             @tab     @tab  X @tab 
+ at item Fraps FPS1             @tab     @tab  X @tab
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
@@ -795,7 +795,7 @@
 
 @multitable @columnfractions .4 .1 .1 .1 .7
 @item Supported Codec @tab Encoding @tab Decoding @tab Comments
- at item MPEG audio layer 2     @tab  IX  @tab  IX 
+ at item MPEG audio layer 2     @tab  IX  @tab  IX
 @item MPEG audio layer 1/3   @tab IX   @tab  IX
 @tab MP3 encoding is supported through the external library LAME.
 @item AC3                    @tab  IX  @tab  IX
@@ -890,7 +890,7 @@
 correct SDL directory when invoked.
 
 @item Extract the current version of FFmpeg.
- 
+
 @item Start the MSYS shell (file @file{msys.bat}).
 
 @item Change to the FFmpeg directory and follow
@@ -905,7 +905,7 @@
 
 @end itemize
 
-Notes: 
+Notes:
 @itemize
 
 @item The target @file{make wininstaller} can be used to create a
@@ -916,7 +916,7 @@
 @item By using @code{./configure --enable-shared} when configuring FFmpeg,
 you can build @file{avcodec.dll} and @file{avformat.dll}. With
 @code{make install} you install the FFmpeg DLLs and the associated
-headers in @file{Program Files/FFmpeg}. 
+headers in @file{Program Files/FFmpeg}.
 
 @item Visual C++ compatibility: If you used @code{./configure --enable-shared}
 when configuring FFmpeg, FFmpeg tries to use the Microsoft Visual
@@ -1068,13 +1068,13 @@
 
 Fran??ois Revol - revol at free dot fr - April 2002
 
-The configure script should guess the configuration itself, 
+The configure script should guess the configuration itself,
 however I still didn't test building on the net_server version of BeOS.
 
 FFserver is broken (needs poll() implementation).
 
 There are still issues with errno codes, which are negative in BeOS, and
-that FFmpeg negates when returning. This ends up turning errors into 
+that FFmpeg negates when returning. This ends up turning errors into
 valid results, then crashes.
 (To be fixed)
 
@@ -1180,33 +1180,33 @@
 ...
 @end example
 
-fprintf and printf are forbidden in libavformat and libavcodec, 
+fprintf and printf are forbidden in libavformat and libavcodec,
 please use av_log() instead.
 
 @node CVS Policy
 @section CVS Policy
 
 @enumerate
- at item 
+ at item
    You must not commit code which breaks FFmpeg! (Meaning unfinished but
    enabled code which breaks compilation or compiles but does not work or
    breaks the regression tests)
    You can commit unfinished stuff (for testing etc), but it must be disabled
    (#ifdef etc) by default so it does not interfere with other developers'
    work.
- at item 
+ at item
    You don't have to over-test things. If it works for you, and you think it
    should work for others, then commit. If your code has problems
    (portability, triggers compiler bugs, unusual environment etc) they will be
    reported and eventually fixed.
- at item 
+ at item
    Do not commit unrelated changes together, split them into self-contained
    pieces.
 @item
    Do not change behavior of the program (renaming options etc) without
    first discussing it on the ffmpeg-devel mailing list. Do not remove
    functionality from the code. Just improve!
-   
+
    Note: Redundant code can be removed.
 @item
    Do not commit changes to the build system (Makefiles, configure script)
@@ -1227,7 +1227,7 @@
    changes.
 
    NOTE: If you had to put if()@{ .. @} over a large (> 5 lines) chunk of code,
-   then either do NOT change the indentation of the inner part within (don't 
+   then either do NOT change the indentation of the inner part within (don't
    move it to the right)! or do so in a separate commit
 @item
    Always fill out the commit log message. Describe in a few lines what you
@@ -1281,7 +1281,7 @@
 option). I cannot read other diffs :-)
 
 Also please do not submit patches which contain several unrelated changes.
-Split them into individual self-contained patches; this makes reviewing 
+Split them into individual self-contained patches; this makes reviewing
 them much easier.
 
 Run the regression tests before submitting a patch so that you can
@@ -1289,7 +1289,7 @@
 
 Patches should be posted as base64 encoded attachments (or any other
 encoding which ensures that the patch won't be trashed during
-transmission) to the ffmpeg-devel mailing list, see 
+transmission) to the ffmpeg-devel mailing list, see
 @url{http://www1.mplayerhq.hu/mailman/listinfo/ffmpeg-devel}
 
 It also helps quite a bit if you tell us what the patch does (for example

Index: ffmpeg_powerpc_performance_evaluation_howto.txt
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg_powerpc_performance_evaluation_howto.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ffmpeg_powerpc_performance_evaluation_howto.txt	9 Jun 2005 19:56:38 -0000	1.5
+++ ffmpeg_powerpc_performance_evaluation_howto.txt	17 Dec 2005 18:14:26 -0000	1.6
@@ -158,6 +158,6 @@
 
 I don't know how to do it, sorry :-) Any idea very much welcome.
 
--- 
+--
 Romain Dolbeau
 <romain at dolbeau.org>

Index: ffplay-doc.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffplay-doc.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ffplay-doc.texi	9 Jun 2005 18:12:07 -0000	1.3
+++ ffplay-doc.texi	17 Dec 2005 18:14:26 -0000	1.4
@@ -19,7 +19,7 @@
 @chapter Invocation
 
 @section Syntax
- at example 
+ at example
 @c man begin SYNOPSIS
 ffplay [options] @file{input_file}
 @c man end

Index: ffserver-doc.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffserver-doc.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ffserver-doc.texi	11 Jun 2005 16:15:53 -0000	1.7
+++ ffserver-doc.texi	17 Dec 2005 18:14:26 -0000	1.8
@@ -64,13 +64,13 @@
 @end example
 
 At this point you should be able to go to your Windows machine and fire up
-Windows Media Player (WMP). Go to Open URL and enter 
+Windows Media Player (WMP). Go to Open URL and enter
 
 @example
     http://<linuxbox>:8090/test.asf
 @end example
 
-You should (after a short delay) see video and hear audio. 
+You should (after a short delay) see video and hear audio.
 
 WARNING: trying to stream test1.mpg doesn't work with WMP as it tries to
 transfer the entire file before starting to play.
@@ -78,7 +78,7 @@
 
 @section What happens next?
 
-You should edit the ffserver.conf file to suit your needs (in terms of 
+You should edit the ffserver.conf file to suit your needs (in terms of
 frame rates etc). Then install ffserver and ffmpeg, write a script to start
 them up, and off you go.
 
@@ -89,10 +89,10 @@
 Maybe you didn't install LAME, or got your ./configure statement wrong. Check
 the ffmpeg output to see if a line referring to MP3 is present. If not, then
 your configuration was incorrect. If it is, then maybe your wiring is not
-set up correctly. Maybe the sound card is not getting data from the right 
+set up correctly. Maybe the sound card is not getting data from the right
 input source. Maybe you have a really awful audio interface (like I do)
-that only captures in stereo and also requires that one channel be flipped. 
-If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before 
+that only captures in stereo and also requires that one channel be flipped.
+If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
 starting ffmpeg.
 
 @subsection The audio and video loose sync after a while.
@@ -114,7 +114,7 @@
 @section What else can it do?
 
 You can replay video from .ffm files that was recorded earlier.
-However, there are a number of caveats, including the fact that the 
+However, there are a number of caveats, including the fact that the
 ffserver parameters must match the original parameters used to record the
 file. If they do not, then ffserver deletes the file before recording into it.
 (Now that I write this, it seems broken).
@@ -129,7 +129,7 @@
 or RM file. The reason for this is that the browser often fetches the
 entire file before starting up the external viewer. The redirection files
 are very small and can be transferred quickly. [The stream itself is
-often 'infinite' and thus the browser tries to download it and never 
+often 'infinite' and thus the browser tries to download it and never
 finishes.]
 
 @section Tips
@@ -140,7 +140,7 @@
 in realtime. This means that there is a pause of a few seconds while the
 buffering is being done by the player. The good news is that this can be
 cured by adding a '?buffer=5' to the end of the URL. This means that the
-stream should start 5 seconds in the past -- and so the first 5 seconds 
+stream should start 5 seconds in the past -- and so the first 5 seconds
 of the stream are sent as fast as the network will allow. It will then
 slow down to real time. This noticeably improves the startup experience.
 
@@ -161,14 +161,14 @@
 This means that if you say 'Preroll 10', then when the stream gets 10
 or more seconds behind, there is no Preroll left.
 
-Fixing this requires a change in the internals of how timestamps are 
+Fixing this requires a change in the internals of how timestamps are
 handled.
 
 @section Does the @code{?date=} stuff work.
 
 Yes (subject to the limitation outlined above). Also note that whenever you
 start ffserver, it deletes the ffm file (if any parameters have changed),
-thus wiping out what you had recorded before. 
+thus wiping out what you had recorded before.
 
 The format of the @code{?date=xxxxxx} is fairly flexible. You should use one
 of the following formats (the 'T' is literal):
@@ -178,7 +178,7 @@
 * YYYY-MM-DDTHH:MM:SSZ    (UTC)
 @end example
 
-You can omit the YYYY-MM-DD, and then it refers to the current day. However 
+You can omit the YYYY-MM-DD, and then it refers to the current day. However
 note that @samp{?date=16:00:00} refers to 16:00 on the current day -- this
 may be in the future and so is unlikely to be useful.
 
@@ -187,7 +187,7 @@
 
 @chapter Invocation
 @section Syntax
- at example 
+ at example
 @c man begin SYNOPSIS
 ffserver [options]
 @c man end

Index: ffserver.conf
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffserver.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ffserver.conf	13 Nov 2005 03:26:43 -0000	1.25
+++ ffserver.conf	17 Dec 2005 18:14:26 -0000	1.26
@@ -34,7 +34,7 @@
 
 # You must use 'ffmpeg' to send a live feed to ffserver. In this
 # example, you can type:
-# 
+#
 # ffmpeg http://localhost:8090/feed1.ffm
 
 # ffserver can also do time shifting. It means that it can stream any
@@ -88,7 +88,7 @@
 Format mpeg
 
 # Bitrate for the audio stream. Codecs usually support only a few
-# different bitrates. 
+# different bitrates.
 AudioBitRate 32
 
 # Number of audio channels: 1 = mono, 2 = stereo
@@ -123,7 +123,7 @@
 # VideoHighQuality
 # Video4MotionVector
 
-# Choose your codecs: 
+# Choose your codecs:
 #AudioCodec mp2
 #VideoCodec mpeg1video
 
@@ -153,7 +153,7 @@
 # stream basis. The first match defines the action. If there are no matches,
 # then the default is the inverse of the last ACL statement.
 #
-# Thus 'ACL allow localhost' only allows access from localhost. 
+# Thus 'ACL allow localhost' only allows access from localhost.
 # 'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
 # allow everybody else.
 
@@ -181,7 +181,7 @@
 #<Stream test.jpg>
 #Feed feed1.ffm
 #Format jpeg
-#VideoFrameRate 2 
+#VideoFrameRate 2
 #VideoIntraOnly
 ##VideoSize 352x240
 #NoAudio
@@ -215,7 +215,7 @@
 </Stream>
 
 
-# MP3 audio 
+# MP3 audio
 
 #<Stream test.mp3>
 #Feed feed1.ffm
@@ -310,7 +310,7 @@
 # 'sdp' extension to the stream name (here
 # http://localhost:8090/test1-sdp.sdp). You should usually give this
 # file to your player to play the stream.
-# 
+#
 # The 'NoLoop' option can be used to avoid looping when the stream is
 # terminated.
 

Index: hooks.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/hooks.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hooks.texi	11 Jun 2005 17:46:18 -0000	1.2
+++ hooks.texi	17 Dec 2005 18:14:26 -0000	1.3
@@ -18,7 +18,7 @@
 order that they were specified on the ffmpeg command line.
 
 Three modules are provided and are described below. They are all intended to
-be used as a base for your own modules. 
+be used as a base for your own modules.
 
 Modules are loaded using the -vhook option to ffmpeg. The value of this parameter
 is a space separated list of arguments. The first is the module name, and the rest

Index: texi2pod.pl
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/texi2pod.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- texi2pod.pl	24 Aug 2003 11:16:29 -0000	1.1
+++ texi2pod.pl	17 Dec 2005 18:14:26 -0000	1.2
@@ -229,7 +229,7 @@
 	$inf = gensym();
 
 	# Try cwd and $ibase.
-	open($inf, "<" . $1) 
+	open($inf, "<" . $1)
 	    or open($inf, "<" . $ibase . "/" . $1)
 		or die "cannot open $1 or $ibase/$1: $!\n";
 	next;