[Ffmpeg-cvslog] CVS: ffmpeg/doc ffserver-doc.texi,1.4,1.5

[The Wanderer]

Diego Biurrun CVS wrote:

> -LAME is important as it allows streaming of audio to Windows Media Player. Don't
> -ask why the other audio types do not work.
> +LAME is important as it allows streaming audio to Windows Media Player.
> +Don't ask why the other audio types do not work.

I think this is actually worse than the previous form. An alternate fix
would have been to insert "the" before "streaming"; I thought I had a
possible fix for the current form as well, but somehow it's not coming
to mind.

> -Maybe you didn't install LAME, or get your ./configure statement right. Check
> -the ffmpeg output to see if a line referring to mp3 is present. If not, then
> +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
>  setup correctly. Maybe the sound card is not getting data from the right 

"set up correctly"

>  Yes, it does. Any thoughts on this would be gratefully received. These
>  differences extend to embedding WMP into a web page. [There are two
> -different object ids that you can use, one of them -- the old one -- cannot
> +different object IDs that you can use, one of them -- the old one -- cannot
>  play very well, and the new one works well (both on the same system). However, 

This doesn't flow right. I see two ways to fix it, both somewhat
intrusive. Either

"two different object IDs that you can use, one of which -- the old one
-- cannot play very well, and the other of which works well"

or

"two different object IDs that you can use; one of them -- the old one
-- cannot play very well, and the new one works well".

>  I suspect that the new one is not available unless you have installed WMP 7].
>  
> @@ -115,17 +116,17 @@
>  You can replay video from .ffm files that was recorded earlier.
>  However, there are a number of caveats which include the fact that the 

"caveats, including the fact that"

>  ffserver parameters must match the original parameters used to record the
> -file. If not, then ffserver deletes the file before recording into it. (Now I write
> -this, this seems broken).
> +file. If not, then ffserver deletes the file before recording into it.
> +(Now that I write this, it seems broken).

"If they do not"

(I *think* that's better.)

>  * When you connect to a live stream, most players (WMP, RA etc) want to

Missing comma in the parentheses.

>  buffer a certain number of seconds of material so that they can display the
>  signal continuously. However, ffserver (by default) starts sending data
> -in real time. This means that there is a pause of a few seconds while the
> +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 says that the
> +cured by adding a '?buffer=5' to the end of the URL. This meanss that the

Doubled "s" in the new form.

>  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 4PM on the current day -- this may be
> -in the future and so unlikely to useful.
> +note that @samp{?date=16:00:00} refers to 4pm on the current day -- this may be
> +in the future and so is unlikely to be useful.

I think that "PM" should in fact be capitalized; I certainly use it that
way, although I would not capitalize the initial letters of the phrase
it expands to.

(On an FFmpeg-documentation blitz today, eh?)

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