Merge from 1.2 main.

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/hackersguide/stream.docbook b/doc/hackersguide/stream.docbook
index d9a5471bd..b9690d9fe 100644
--- a/doc/hackersguide/stream.docbook
+++ b/doc/hackersguide/stream.docbook
@@ -1,11 +1,11 @@
 <chapter id="stream">
  <title>xine's stream layer</title>
- 
+
  <sect1>
   <title>Input layer</title>
   <para>
    Many media players expect streams to be stored within files on
-   some local medium. In actual fact, media may be streamed over a 
+   some local medium. In actual fact, media may be streamed over a
    network (e.g. via HTTP or RTP), encoded onto a specialized medium
    (e.g. DVD), etc. To allow you to access all this media, xine supports
    the concept of an "input plugin". The tasks performed by an
@@ -156,7 +156,7 @@
    <para>
     xine's demuxer layer is responsible for taking apart multimedia files or
     streams so that the engine can decode them and present them to the user.
-    "Demuxer" is short for demultiplexor, which is the opposite of 
+    "Demuxer" is short for demultiplexor, which is the opposite of
     multiplexing. This refers to the process of combining 2 or more things
     into one. Multimedia streams usually, at a minimum, multiplex an audio
     stream and a video stream together into one stream. Sometimes, there are
@@ -329,7 +329,7 @@
     <programlisting>&nbsp;&nbsp;&nbsp;void demux_send_headers(demux_plugin_t *this_gen);</programlisting>
     This function generally reads the headers of the stream, does whatever it
     has to do to figure out what audio and video codecs are used in the file,
-    and asks the xine engine to initialize the correct decoders with the 
+    and asks the xine engine to initialize the correct decoders with the
     proper parameters (like width and height for video, sample rate and
     channels for audio).
    </para>