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

[The Wanderer]

Diego Biurrun CVS wrote:

>  # ogg        : Ogg format (Vorbis audio codec)
>  # rm         : Real Networks compatible stream. Multiplexed audio and video.
>  # ra         : Real Networks compatible stream. Audio only.

Not actually something modified by the patch, but: it's my understanding
that that is correctly written "RealNetworks", i.e. without the space. I
also have my usual theoretically-ambiguous-meaning objections about
hyphenation of adjectival phrases (i.e., is it a "stream" compatible
with RealNetworks, or is it a "compatible stream" of the type known as
RealNetworks?), but nobody seems to agree with me on that.

> @@ -81,7 +81,7 @@
>  # jpeg       : Generate a single JPEG image.
>  # asf        : ASF compatible streaming (Windows Media Player format).
>  # swf        : Macromedia flash(tm) compatible stream

"Flash(TM)", and/or a possible space before the open-paren.

> -# 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.

> @@ -110,14 +110,14 @@
>  # The following abbreviation are defined : sqcif, qcif, cif, 4cif

"abbreviations"

>  ##################################################################
>  # A stream coming from a file : you only need to set the input
> -# filename and optionnally a new format. Supported conversions:
> -#    avi -> asf
> +# filename and optionally a new format. Supported conversions:
> +#    AVI -> ASF

In the line preceding the changed ones, there is an apparently
extraneous space by the colon.

-- 
       The Wanderer

Warning: Simply because I argue an issue does not mean I agree with any
side of it.

A government exists to serve its citizens, not to control them.