[Ffmpeg-cvslog] CVS: ffmpeg/doc ffserver.conf,1.18,1.19

[Diego Biurrun]

On Thu, Jun 09, 2005 at 03:36:26PM -0400, The Wanderer wrote:
> Diego Biurrun CVS wrote:
> 
> > # swf        : Macromedia flash(tm) compatible stream
> 
> "Flash(TM)", and/or a possible space before the open-paren.

I've removed the (tm), we don't add these signs anywhere else...

> >-# avi        : AVI format (open divx video, mpeg audio sound)
> >+# avi        : AVI format (open DivX video, MPEG audio sound)
> 
> What does the "open" mean here? I seem to recall that there is/was
> something known as OpenDivX, and it's possible that this is intended to
> refer to that; if so, that form should probably be used, and if not, the
> word "open" should probably be removed.

Yes.  I think it should simply be MPEG-4, right?

> > ##################################################################
> > # A stream coming from a file : you only need to set the input
> 
> In the line preceding the changed ones, there is an apparently
> extraneous space by the colon.

Probably Fabrice (or another frenchman) wrote this config file.  Apparently
it is French typographical rule to put a space before a colon.

Diego