Commit ca2d48e6 authored by diego's avatar diego

Further spelling/grammar/wording fixes as suggested by the Wanderer and Mans


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4371 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ae3bc7a8
...@@ -52,7 +52,7 @@ First, build the kit. It *really* helps to have installed LAME first. Then when ...@@ -52,7 +52,7 @@ First, build the kit. It *really* helps to have installed LAME first. Then when
you run the ffserver ./configure, make sure that you have the --enable-mp3lame you run the ffserver ./configure, make sure that you have the --enable-mp3lame
flag turned on. flag turned on.
LAME is important as it allows streaming audio to Windows Media Player. LAME is important as it allows for streaming audio to Windows Media Player.
Don't ask why the other audio types do not work. Don't ask why the other audio types do not work.
As a simple test, just run the following two command lines (assuming that you As a simple test, just run the following two command lines (assuming that you
...@@ -89,7 +89,7 @@ them up, and off you go. ...@@ -89,7 +89,7 @@ them up, and off you go.
Maybe you didn't install LAME, or got your ./configure statement wrong. Check 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 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 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. Maybe the sound card is not getting data from the right
input source. Maybe you have a really awful audio interface (like I do) 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. 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 If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
...@@ -107,16 +107,16 @@ Yes, it does. Who knows why? ...@@ -107,16 +107,16 @@ Yes, it does. Who knows why?
Yes, it does. Any thoughts on this would be gratefully received. These Yes, it does. Any thoughts on this would be gratefully received. These
differences extend to embedding WMP into a web page. [There are two 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, the old one cannot
play very well, and the new one works well (both on the same system). However, play very well, and the new one works well (both on the same system). However,
I suspect that the new one is not available unless you have installed WMP 7]. I suspect that the new one is not available unless you have installed WMP 7].
@section What else can it do? @section What else can it do?
You can replay video from .ffm files that was recorded earlier. You can replay video from .ffm files that was recorded earlier.
However, there are a number of caveats which include 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 ffserver parameters must match the original parameters used to record the
file. If not, then ffserver deletes the file before recording into it. file. If they do not, then ffserver deletes the file before recording into it.
(Now that I write this, it seems broken). (Now that I write this, it seems broken).
You can fiddle with many of the codec choices and encoding parameters, and You can fiddle with many of the codec choices and encoding parameters, and
...@@ -134,12 +134,12 @@ finishes.] ...@@ -134,12 +134,12 @@ finishes.]
@section Tips @section Tips
* When you connect to a live stream, most players (WMP, RA etc) want to * When you connect to a live stream, most players (WMP, RA, etc) want to
buffer a certain number of seconds of material so that they can display the buffer a certain number of seconds of material so that they can display the
signal continuously. However, ffserver (by default) starts sending data signal continuously. However, ffserver (by default) starts sending data
in realtime. 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 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 meanss that the 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 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. slow down to real time. This noticeably improves the startup experience.
...@@ -179,8 +179,8 @@ of the following formats (the 'T' is literal): ...@@ -179,8 +179,8 @@ of the following formats (the 'T' is literal):
@end example @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 4pm on the current day -- this may be note that @samp{?date=16:00:00} refers to 16:00 on the current day -- this
in the future and so is unlikely to be useful. may be in the future and so is unlikely to be useful.
You use this by adding the ?date= to the end of the URL for the stream. You use this by adding the ?date= to the end of the URL for the stream.
For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}. For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment