xine - a free video player

# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 2]

diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2001-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine video decoder plugin using ffmpeg
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -66,7 +66,7 @@
   int                     thread_count;
   int8_t                  skip_loop_filter_enum;
   int8_t                  choose_speed_over_accuracy;
-  
+
   xine_t                 *xine;
 } ff_video_class_t;
 
@@ -98,13 +98,13 @@
   int               bufsize;
   int               size;
   int               skipframes;
-  
+
   int               slice_offset_size;
 
   AVFrame          *av_frame;
   AVCodecContext   *context;
   AVCodec          *codec;
-  
+
   int               pp_quality;
   int               pp_flags;
   pp_context_t     *pp_context;
@@ -117,7 +117,7 @@
   int               aspect_ratio_prio;
   int               frame_flags;
   int               crop_right, crop_bottom;
-  
+
   int               output_format;
 
   xine_list_t       *dr1_frames;
@@ -145,7 +145,7 @@
   vo_frame_t *img;
   int width  = context->width;
   int height = context->height;
-        
+
   if (!this->bih.biWidth || !this->bih.biHeight) {
     this->bih.biWidth = width;
     this->bih.biHeight = height;
@@ -157,12 +157,12 @@
       set_stream_info(this);
     }
   }
-  
+
   avcodec_align_dimensions(context, &width, &height);
 
   if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) {
     if (!this->is_direct_rendering_disabled) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
               _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"));
       this->is_direct_rendering_disabled = 1;
     }
@@ -173,14 +173,14 @@
     av_frame->data[2]= NULL;
     return avcodec_default_get_buffer(context, av_frame);
   }
-  
+
   if((width != this->bih.biWidth) || (height != this->bih.biHeight)) {
     if(this->stream->video_out->get_capabilities(this->stream->video_out) & VO_CAP_CROP) {
       this->crop_right = width - this->bih.biWidth;
       this->crop_bottom = height - this->bih.biHeight;
     } else {
       if (!this->is_direct_rendering_disabled) {
-        xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+        xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
                 _("ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"));
         this->is_direct_rendering_disabled = 1;
       }
@@ -195,7 +195,7 @@
   img = this->stream->video_out->get_frame (this->stream->video_out,
                                             width,
                                             height,
-                                            this->aspect_ratio, 
+                                            this->aspect_ratio,
                                             this->output_format,
                                             VO_BOTH_FIELDS|this->frame_flags);
 
@@ -235,7 +235,7 @@
     }
 
     xine_list_iterator_t it;
-    
+
     it = xine_list_find(this->dr1_frames, av_frame);
     assert(it);
     if( it != NULL )
@@ -289,7 +289,7 @@
[... 712 lines omitted ...]
@@ -1632,27 +1632,27 @@
 
   if(this->yuv_init)
     free_yuv_planes(&this->yuv);
-  
+
   if( this->context )
     av_free( this->context );
 
   if( this->av_frame )
     av_free( this->av_frame );
-  
+
   if (this->buf)
     free(this->buf);
   this->buf = NULL;
-  
+
   if(this->pp_context)
     pp_free_context(this->pp_context);
-    
+
   if(this->pp_mode)
     pp_free_mode(this->pp_mode);
 
   mpeg_parser_dispose(this->mpeg_parser);
-    
+
   xine_list_delete(this->dr1_frames);
-  
+
   free (this_gen);
 }
 
@@ -1678,7 +1678,7 @@
   this->context           = avcodec_alloc_context();
   this->context->opaque   = this;
   this->context->palctrl  = NULL;
-  
+
   this->decoder_ok        = 0;
   this->decoder_init_mode = 1;
   this->buf               = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
@@ -1690,9 +1690,9 @@
   this->pp_quality        = 0;
   this->pp_context        = NULL;
   this->pp_mode           = NULL;
-  
+
   this->mpeg_parser       = NULL;
-  
+
   this->dr1_frames        = xine_list_new();
 
 #ifdef LOG
@@ -1706,7 +1706,7 @@
 
   ff_video_class_t *this;
   config_values_t  *config;
-  
+
   this = calloc(1, sizeof (ff_video_class_t));
 
   this->decoder_class.open_plugin     = ff_video_open_plugin;
@@ -1716,12 +1716,12 @@
   this->xine                          = xine;
 
   pthread_once( &once_control, init_once_routine );
-  
+
   /* Configuration for post processing quality - default to mid (3) for the
    * moment */
   config = xine->config;
-  
-  this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3, 
+
+  this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3,
     0, PP_QUALITY_MAX,
     _("MPEG-4 postprocessing quality"),
     _("You can adjust the amount of post processing applied to MPEG-4 video.\n"
@@ -1730,8 +1730,8 @@
       "too heavy post processing can actually make the image worse by blurring it "
       "too much."),
     10, pp_quality_cb, this);
-  
-  this->thread_count = xine->config->register_num(config, "video.processing.ffmpeg_thread_count", 1, 
+
+  this->thread_count = xine->config->register_num(config, "video.processing.ffmpeg_thread_count", 1,
     _("FFmpeg video decoding thread count"),
     _("You can adjust the number of video decoding threads which FFmpeg may use.\n"
       "Higher values should speed up decoding but it depends on the codec used "
@@ -1740,7 +1740,7 @@
       "A change of this setting will take effect with playing the next stream."),
     10, thread_count_cb, this);
 
-  this->skip_loop_filter_enum = xine->config->register_enum(config, "video.processing.ffmpeg_skip_loop_filter", 0, 
+  this->skip_loop_filter_enum = xine->config->register_enum(config, "video.processing.ffmpeg_skip_loop_filter", 0,
     (char **)skip_loop_filter_enum_names,
     _("Skip loop filter"),
     _("You can control for which frames the loop filter shall be skipped after "
@@ -1751,7 +1751,7 @@
       "A change of this setting will take effect with playing the next stream."),
     10, skip_loop_filter_enum_cb, this);
 
-  this->choose_speed_over_accuracy = xine->config->register_bool(config, "video.processing.ffmpeg_choose_speed_over_accuracy", 0, 
+  this->choose_speed_over_accuracy = xine->config->register_bool(config, "video.processing.ffmpeg_choose_speed_over_accuracy", 0,
     _("Choose speed over specification compliance"),
     _("You may want to allow speed cheats which violate codec specification.\n"
       "Cheating may speed up decoding but can also lead to decoding artefacts.\n"
@@ -1761,14 +1761,14 @@
   return this;
 }
 
-static const uint32_t wmv8_video_types[] = { 
+static const uint32_t wmv8_video_types[] = {
   BUF_VIDEO_WMV8,
-  0 
+  0
 };
 
-static const uint32_t wmv9_video_types[] = { 
+static const uint32_t wmv9_video_types[] = {
   BUF_VIDEO_WMV9,
-  0 
+  0
 };
 
 decoder_info_t dec_info_ffmpeg_video = {

diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c
--- a/src/combined/ffmpeg/ffmpeg_decoder.c
+++ b/src/combined/ffmpeg/ffmpeg_decoder.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2001-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -46,7 +46,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "ffmpegvideo", XINE_VERSION_CODE, &dec_info_ffmpeg_video, init_video_plugin },
   { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin },
   { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv9", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv9, init_video_plugin },
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -1,23 +1,23 @@
 /*
  * Copyright (C) 2001-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
+
 #ifndef HAVE_XINE_DECODER_H
 #define HAVE_XINE_DECODER_H
 
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -74,8 +74,8 @@
  * FLAC callback functions
  */
 
-static FLAC__StreamDecoderReadStatus 
-flac_read_callback (const FLAC__StreamDecoder *decoder, 
+static FLAC__StreamDecoderReadStatus
+flac_read_callback (const FLAC__StreamDecoder *decoder,
                     FLAC__byte buffer[],
                     unsigned *bytes,
                     void *client_data)
@@ -123,36 +123,36 @@
     lprintf("flac_write_callback\n");
 
     while( samples_left ) {
-     
+
       audio_buffer = this->stream->audio_out->get_buffer(this->stream->audio_out);
 
       if( audio_buffer->mem_size < samples_left * frame->header.channels * bytes_per_sample )
         buf_samples = audio_buffer->mem_size / (frame->header.channels * bytes_per_sample);
       else
         buf_samples = samples_left;
-        
-        
+
+
       if( frame->header.bits_per_sample == 8 ) {
         data8 = (int8_t *)audio_buffer->mem;
-        
+
         for( j=0; j < buf_samples; j++ )
           for( i=0; i < frame->header.channels; i++ )
             *data8++ = buffer[i][j];
-       
+
       } else {
-        
+
         data16 = (int16_t *)audio_buffer->mem;
-        
+
         for( j=0; j < buf_samples; j++ )
           for( i=0; i < frame->header.channels; i++ )
             *data16++ = buffer[i][j];
-      }     
+      }
 
       audio_buffer->num_frames = buf_samples;
       audio_buffer->vpts = this->pts;
       this->pts = 0;
       this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-      
+
       samples_left -= buf_samples;
     }
     return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
@@ -165,9 +165,9 @@
                         void *client_data)
 {
   /* flac_decoder_t *this = (flac_decoder_t *)client_data; */
-  
+
   lprintf("Metadata callback called!\n");
-  
+
 #ifdef LOG
   if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
     printf("libflac: min_blocksize = %d\n", metadata->data.stream_info.min_blocksize);
@@ -201,7 +201,7 @@
   else
     printf("libflac: unknown error.\n");
 #endif
-                                                                                
+
     return;
 }
 
@@ -210,34 +210,34 @@
  * FLAC plugin decoder
  */
 
-static void 
+static void
 flac_reset (audio_decoder_t *this_gen)
 {
   flac_decoder_t *this = (flac_decoder_t *) this_gen;
 
   this->buf_pos = 0;
-  
-  if( FLAC__stream_decoder_get_state(this->flac_decoder) != 
-                FLAC__STREAM_DECODER_SEARCH_FOR_METADATA ) 
+
+  if( FLAC__stream_decoder_get_state(this->flac_decoder) !=
+                FLAC__STREAM_DECODER_SEARCH_FOR_METADATA )
     FLAC__stream_decoder_flush (this->flac_decoder);
 }
 
-static void 
-flac_discontinuity (audio_decoder_t *this_gen) 
+static void
+flac_discontinuity (audio_decoder_t *this_gen)
 {
   flac_decoder_t *this = (flac_decoder_t *) this_gen;
 
   this->pts = 0;
-  
+
   lprintf("Discontinuity!\n");
 }
 
-static void 
+static void
 flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
 {
     flac_decoder_t *this = (flac_decoder_t *) this_gen;
     int ret = 1;
-        
+
     /* We are getting the stream header, open up the audio
      * device, and collect information about the stream
      */
@@ -277,15 +277,15 @@
 
         xine_fast_memcpy (&this->buf[this->buf_pos], buf->content, buf->size);
         this->buf_pos += buf->size;
-        
+
         if (buf->pts)
           this->pts = buf->pts;
 
         /* We have enough to decode a frame */
         while( ret && this->buf_pos > this->min_size ) {
-            
+
             FLAC__StreamDecoderState state = FLAC__stream_decoder_get_state(this->flac_decoder);
-                
+
             if( state ==  FLAC__STREAM_DECODER_SEARCH_FOR_METADATA ) {
               lprintf("process_until_end_of_metadata\n");
               ret = FLAC__stream_decoder_process_until_end_of_metadata (this->flac_decoder);
@@ -301,24 +301,24 @@
         }
     } else
         return;
-    
+
 
 }
 
 static void
 flac_dispose (audio_decoder_t *this_gen) {
-    flac_decoder_t *this = (flac_decoder_t *) this_gen; 
+    flac_decoder_t *this = (flac_decoder_t *) this_gen;
 
     FLAC__stream_decoder_finish (this->flac_decoder);
 
     FLAC__stream_decoder_delete (this->flac_decoder);
 
-    if (this->output_open) 
+    if (this->output_open)
         this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
     if (this->buf)
       free(this->buf);
-    
+
     free (this_gen);
 }
 
@@ -384,7 +384,7 @@
 static void *
 init_plugin (xine_t *xine, void *data) {
     flac_class_t *this;
-  
+
     this = calloc(1, sizeof (flac_class_t));
 
     this->decoder_class.open_plugin     = open_plugin;
@@ -398,7 +398,7 @@
 
 void *demux_flac_init_class (xine_t *xine, void *data);
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_FLAC, 0
  };
 
@@ -408,7 +408,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
   { PLUGIN_AUDIO_DECODER, 16, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -64,7 +64,7 @@
   demux_plugin_t        demux_plugin;
 
   xine_stream_t        *stream;
-  
+
   fifo_buffer_t        *audio_fifo;
   fifo_buffer_t        *video_fifo;
 
@@ -110,15 +110,15 @@
                     void *client_data)
 {
     demux_flac_t *this    = (demux_flac_t *)client_data;
-    input_plugin_t *input = this->input; 
+    input_plugin_t *input = this->input;
     off_t offset = *bytes;
 
     lprintf("flac_read_callback\n");
-    
+
     /* This should only be called when flac is reading the metadata
      * of the flac stream.
      */
-    
+
     offset = input->read (input, buffer, offset);
 
     lprintf("Read %lld / %u bytes into buffer\n", offset, *bytes);
@@ -128,7 +128,7 @@
     {
       *bytes = offset;
       lprintf("Marking EOF\n");
-      
+
       this->status = DEMUX_FINISHED;
 #ifdef LEGACY_FLAC
       return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
@@ -140,7 +140,7 @@
     {
       *bytes = offset;
       lprintf("Read was perfect\n");
-    
+
 #ifdef LEGACY_FLAC
       return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
 #else
@@ -231,7 +231,7 @@
 #endif
 }
 
-static FLAC__bool 
+static FLAC__bool
 flac_eof_callback (const FLAC__SeekableStreamDecoder *decoder,
                     void *client_data)
 {
@@ -253,28 +253,28 @@
     }
 }
 
-static FLAC__StreamDecoderWriteStatus 
-flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, 
+static FLAC__StreamDecoderWriteStatus
+flac_write_callback (const FLAC__SeekableStreamDecoder *decoder,
                      const FLAC__Frame *frame,
                      const FLAC__int32 * const buffer[],
-                     void *client_data) 
+                     void *client_data)
 {
     /* This should never be called, all we use flac for in this demuxer
      * is seeking. We do the decoding in the decoder
      */
-    
+
   lprintf("Error: Write callback was called!\n");
 
   return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 }
 
-static void 
-flac_metadata_callback (const FLAC__SeekableStreamDecoder *decoder, 
-                        const FLAC__StreamMetadata *metadata, 
+static void
+flac_metadata_callback (const FLAC__SeekableStreamDecoder *decoder,
+                        const FLAC__StreamMetadata *metadata,
                         void *client_data)
 {
     demux_flac_t *this = (demux_flac_t *)client_data;
-  
+
     lprintf("IN: Metadata callback\n");
 
     /* This should be called when we first look at a flac stream,
@@ -293,8 +293,8 @@
      return;
 }
 
-static void 
-flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, 
+static void
+flac_error_callback (const FLAC__SeekableStreamDecoder *decoder,
                      FLAC__StreamDecoderErrorStatus status,
[... 55 lines omitted ...]
+static void
 demux_flac_dispose (demux_plugin_t *this_gen) {
     demux_flac_t *this = (demux_flac_t *) this_gen;
 
@@ -449,7 +449,7 @@
     return;
 }
 
-static int 
+static int
 demux_flac_get_status (demux_plugin_t *this_gen) {
     demux_flac_t *this = (demux_flac_t *) this_gen;
 
@@ -459,7 +459,7 @@
 }
 
 
-static int 
+static int
 demux_flac_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) {
     demux_flac_t *this = (demux_flac_t *) this_gen;
 
@@ -477,15 +477,15 @@
         }
         start_pos = (uint64_t)(distance * (this->data_size - this->data_start));
     }
-    
+
     if (start_pos || !start_time) {
-        
+
         start_pos += this->data_start;
         this->input->seek (this->input, start_pos, SEEK_SET);
         lprintf ("Seek to position: %lld\n", start_pos);
-    
+
     } else {
-      
+
         double distance = (double)start_time;
         uint64_t target_sample;
         FLAC__bool s = false;
@@ -516,9 +516,9 @@
     return this->status;
 }
 
-static int 
+static int
 demux_flac_get_stream_length (demux_plugin_t *this_gen) {
-    demux_flac_t *this = (demux_flac_t *) this_gen; 
+    demux_flac_t *this = (demux_flac_t *) this_gen;
 
     lprintf("demux_flac_get_stream_length\n");
 
@@ -528,14 +528,14 @@
         return 0;
 }
 
-static uint32_t 
+static uint32_t
 demux_flac_get_capabilities (demux_plugin_t *this_gen) {
   lprintf("demux_flac_get_capabilities\n");
 
   return DEMUX_CAP_NOCAP;
 }
 
-static int 
+static int
 demux_flac_get_optional_data (demux_plugin_t *this_gen, void *data, int dtype) {
   lprintf("demux_flac_get_optional_data\n");
 
@@ -543,8 +543,8 @@
 }
 
 static demux_plugin_t *
-open_plugin (demux_class_t *class_gen, 
-             xine_stream_t *stream, 
+open_plugin (demux_class_t *class_gen,
+             xine_stream_t *stream,
              input_plugin_t *input) {
     demux_flac_t *this;
 
@@ -556,22 +556,22 @@
           uint8_t      buf[MAX_PREVIEW_SIZE];
           int          len;
 
-          /* 
+          /*
            * try to get a preview of the data
            */
           len = input->get_optional_data (input, buf, INPUT_OPTIONAL_DATA_PREVIEW);
           if (len == INPUT_OPTIONAL_UNSUPPORTED) {
-      
+
             if (input->get_capabilities (input) & INPUT_CAP_SEEKABLE) {
-      
+
               input->seek (input, 0, SEEK_SET);
               if ( (len=input->read (input, buf, 1024)) <= 0)
                 return NULL;
               input->seek (input, 0, SEEK_SET);
-      
+
             } else
               return NULL;
-          }      
+          }
 
           /* FIXME: Skip id3v2 tag */
           /* Look for fLaC tag at the beginning of file */
@@ -607,7 +607,7 @@
     this->demux_plugin.demux_class       = class_gen;
 
     this->seek_flag = 0;
-  
+
 
     /* Get a new FLAC decoder and hook up callbacks */
 #ifdef LEGACY_FLAC
@@ -703,7 +703,7 @@
 demux_flac_init_class (xine_t *xine, void *data) {
 
     demux_flac_class_t     *this;
-  
+
     lprintf("demux_flac_init_class\n");
 
     this         = calloc(1, sizeof (demux_flac_class_t));

diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -25,7 +25,7 @@
   10                       /* priority */
 };
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_NSF,
   0
 };
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -234,7 +234,7 @@
   return &this->audio_decoder;
 }
 
-/* This function allocates a private audio decoder class and initializes 
+/* This function allocates a private audio decoder class and initializes
  * the class's member functions. */
 void *decoder_nsf_init_plugin (xine_t *xine, void *data) {
 
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -22,7 +22,7 @@
  * NSF File "Demuxer" by Mike Melanson (melanson@...)
  * This is really just a loader for NES Music File Format (extension NSF)
  * which loads an entire NSF file and passes it over to the NSF audio
- * decoder. 
+ * decoder.
  *
  * After the file is sent over, the demuxer controls the playback by
  * sending empty buffers with incrementing pts values.
@@ -167,7 +167,7 @@
       buf->decoder_info[1] = 0;
 
     buf->type = BUF_AUDIO_NSF;
-    if(this->total_songs) 
+    if(this->total_songs)
       buf->extra_info->input_normpos = (this->current_song - 1) * 65535 / this->total_songs;
     buf->extra_info->input_time = this->current_pts / 90;
     buf->pts = this->current_pts;
diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c
--- a/src/combined/wavpack_combined.c
+++ b/src/combined/wavpack_combined.c
@@ -27,7 +27,7 @@
   0			/* priority */
 };
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_WAVPACK, 0
  };
 
diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -140,7 +140,7 @@
   this->buf_pos = 0;
 }
 
-static void wavpack_discontinuity (audio_decoder_t *const this_gen) 
+static void wavpack_discontinuity (audio_decoder_t *const this_gen)
 {
   /* wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; */
 
@@ -150,7 +150,7 @@
 static void wavpack_decode_data (audio_decoder_t *const this_gen, buf_element_t *const buf)
 {
     wavpack_decoder_t *const this = (wavpack_decoder_t *) this_gen;
-        
+
     /* We are getting the stream header, open up the audio
      * device, and collect information about the stream
      */
@@ -194,7 +194,7 @@
 
       xine_fast_memcpy (&this->buf[this->buf_pos], buf->content, buf->size);
       this->buf_pos += buf->size;
-        
+
       if ( buf->decoder_flags & BUF_FLAG_FRAME_END ) {
 	static WavpackStreamReader wavpack_buffer_reader = {
 	  .read_bytes		= xine_buffer_read_bytes,
@@ -216,7 +216,7 @@
 	this->buf_pos = 0;
 
 	if ( le2me_32(header->samples_count) == 0 ) return;
-	
+
 	ctx = WavpackOpenFileInputEx(&wavpack_buffer_reader, this, NULL, error, OPEN_STREAMING, 0);
 	if ( ! ctx ) {
 	  lprintf("unable to open the stream: %s\n", error);
@@ -250,14 +250,14 @@
 	  }
 
 	  lprintf("Decoded %d samples\n", buf_samples);
-	  
+
 	  samples_left -= decoded_count;
 
 	  audio_buffer->num_frames = decoded_count;
 	  audio_buffer->vpts = 0; /* TODO: Fix the pts calculation */
 	  // audio_buffer->vpts = (buf->pts * (samples_total-samples_left)) / samples_total;
 	  lprintf("Audio buffer with pts %"PRId64"\n", audio_buffer->vpts);
-	  
+
 	  switch(this->bits_per_sample) {
 	  case 8: {
 	    int8_t *data8 = (int8_t*)audio_buffer->mem;
@@ -282,13 +282,13 @@
 }
 
 static void wavpack_dispose (audio_decoder_t *this_gen) {
-    wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen; 
+    wavpack_decoder_t *this = (wavpack_decoder_t *) this_gen;
 
     if (this->output_open)
         this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
     free(this->buf);
-    
+
     free (this_gen);
 }
 
@@ -313,7 +313,7 @@
 
 void *decoder_wavpack_init_plugin (xine_t *xine, void *data) {
     wavpack_class_t *this;
-  
+
     this = calloc(1, sizeof (wavpack_class_t));
 
     this->decoder_class.open_plugin     = open_plugin;
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -39,7 +39,7 @@
 
 typedef struct {
   demux_plugin_t demux_plugin;
-  
+
   xine_stream_t *stream;
   fifo_buffer_t *audio_fifo;
   input_plugin_t *input;
@@ -188,7 +188,7 @@
     this->status = DEMUX_FINISHED;
     return this->status;
   }
-  
+
   lprintf("current sample: %u\n", this->current_sample);
 
   do {
@@ -229,7 +229,7 @@
       input_time_guess *= buf->extra_info->input_normpos;
       input_time_guess /= 65535;
       buf->extra_info->input_time = input_time_guess;
-      
+
       if ( ! header_sent )
 	offset = sizeof(wvheader_t);
 
@@ -247,7 +247,7 @@
 
       if ( bytes_to_read <= 0 && (le2me_32(header.flags) & FINAL_BLOCK) == FINAL_BLOCK)
 	buf->decoder_flags |= BUF_FLAG_FRAME_END;
-    
+
       this->audio_fifo->put(this->audio_fifo, buf);
     }
   } while ( (le2me_32(header.flags) & FINAL_BLOCK) != FINAL_BLOCK );
@@ -271,7 +271,7 @@
   /* Send header to decoder */
   if (this->audio_fifo) {
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
-    
+
     buf->type            = BUF_AUDIO_WAVPACK;
     buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
     buf->decoder_info[0] = this->input->get_length(this->input);
@@ -346,12 +346,12 @@
   case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
-    
+
     if (!open_wv_file(this)) {
       free (this);
       return NULL;
     }
-  
+
   break;
 
   default:
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -332,7 +332,7 @@
 
     buf->pts = pts;
     if( this->input->get_length (this->input) )
-      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                        65535 / this->input->get_length (this->input) );
     buf->extra_info->input_time = buf->pts / 90 ;
     buf->type       = this->si[stream_num]->buf_types;
@@ -585,10 +585,10 @@
   int normpos = 0;
 
   if( this->input->get_length (this->input) )
-    normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    normpos = (int)( (double) this->input->get_current_pos (this->input) *
                               65535 / this->input->get_length (this->input) );
 
-  
+
   hdrlen = (*op->packet & PACKET_LEN_BITS01) >> 6;
   hdrlen |= (*op->packet & PACKET_LEN_BITS2) << 1;
 
@@ -693,7 +693,7 @@
         check_newpts( this, pts, PTS_VIDEO, decoder_flags );
       } else
         pts = 0;
-      
+
       llprintf(DEBUG_VIDEO_PACKETS,
                "videostream %d op-gpos %" PRId64 " hdr-gpos %" PRId64 " pts %" PRId64 " \n",
                stream_num,
@@ -1344,7 +1344,7 @@
   } else {
     this->si[stream_num]->buf_types = BUF_CONTROL_NOP;
   }
-  
+
 }
 
 static void decode_cmml_header (demux_ogg_t *this, const int stream_num, ogg_packet *op) {
@@ -1619,10 +1619,10 @@
   if (ogg_page_eos(&this->og)) {
     int i;
     int finished_streams = 0;
-  
+
     lprintf("end of stream, serialnumber %d\n", cur_serno);
     this->si[stream_num]->delivered_eos = 1;
-  
+
     /* check if all logical streams are finished */
     for (i = 0; i < this->num_streams; i++) {
       finished_streams += this->si[i]->delivered_eos;
@@ -1644,12 +1644,12 @@
       this->unhandled_video_streams = 0;
       this->num_spu_streams   = 0;
       this->avg_bitrate       = 1;
-      
+
       /* try to read a chained stream */
       this->send_newpts = 1;
       this->last_pts[0] = 0;
       this->last_pts[1] = 0;
-      
+
       /* send control buffer to avoid buffer leak */
       _x_demux_control_end(this->stream, 0);
       _x_demux_control_start(this->stream);
@@ -1778,7 +1778,7 @@
 	hasn` changed its length, otherwise no seek to "new" data is possible*/
 
 	lprintf ("seek to time %d called\n",start_time);
-	lprintf ("current time is %d\n",current_time); 
+	lprintf ("current time is %d\n",current_time);
 
 	if (current_time > start_time) {
 	  /*seek between beginning and current_pos*/
@@ -1798,7 +1798,7 @@
 	}
 
 	lprintf ("current_pos is %" PRId64 "\n",current_pos);
-	lprintf ("new_pos is %" PRId64 "\n",start_pos); 
+	lprintf ("new_pos is %" PRId64 "\n",start_pos);
 
       } else {
 	/*seek using avg_bitrate*/
@@ -1817,9 +1817,9 @@
       ogg_stream_reset(&this->si[i]->oss);
     }
 
-    /*some strange streams have no syncpoint flag set at the beginning*/	 
-    if (start_pos == 0)	 
-      this->keyframe_needed = 0;	 
+    /*some strange streams have no syncpoint flag set at the beginning*/
+    if (start_pos == 0)
+      this->keyframe_needed = 0;
 
     lprintf ("seek to %" PRId64 " called\n",start_pos);
 
@@ -1830,7 +1830,7 @@
   /* fixme - this would be a nice position to do the following tasks
      1. adjust an ogg videostream to a keyframe
      2. compare the keyframe_pts with start_time. if the difference is to
-        high (e.g. larger than max keyframe_intervall, do a new seek or 
+        high (e.g. larger than max keyframe_intervall, do a new seek or
 	continue reading
      3. adjust the audiostreams in such a way, that the
         difference is not to high.
@@ -1838,12 +1838,12 @@
      In short words, do all the cleanups necessary to continue playback
      without further actions
   */
-  
+
   this->send_newpts     = 1;
   this->status          = DEMUX_OK;
-  
+
   if( !playing ) {
-    
+
     this->buf_flag_seek     = 0;
 
   } else {
@@ -1860,13 +1860,13 @@
 
     _x_demux_flush_engine(this->stream);
   }
-  
+
   return this->status;
 }
 
 static int demux_ogg_get_stream_length (demux_plugin_t *this_gen) {
 
-  demux_ogg_t *this = (demux_ogg_t *) this_gen; 
+  demux_ogg_t *this = (demux_ogg_t *) this_gen;
 
   if (this->time_length==-1){
     if (this->avg_bitrate) {
@@ -1881,7 +1881,7 @@
 }
 
 static uint32_t demux_ogg_get_capabilities(demux_plugin_t *this_gen) {
-  demux_ogg_t *this = (demux_ogg_t *) this_gen; 
+  demux_ogg_t *this = (demux_ogg_t *) this_gen;
   int cap_chapter = 0;
 
   if (this->chapter_info)
@@ -1911,8 +1911,8 @@
 
 static int demux_ogg_get_optional_data(demux_plugin_t *this_gen,
 					void *data, int data_type) {
-  
-  demux_ogg_t *this = (demux_ogg_t *) this_gen; 
+
+  demux_ogg_t *this = (demux_ogg_t *) this_gen;
 
   char *str=(char *) data;
   int channel = *((int *)data);
@@ -1997,7 +1997,7 @@
 }
 
 static demux_plugin_t *anx_open_plugin (demux_class_t *class_gen,
-				        xine_stream_t *stream, 
+				        xine_stream_t *stream,
 				        input_plugin_t *input) {
 
   demux_ogg_t *this;
@@ -2026,13 +2026,13 @@
   this->demux_plugin.get_capabilities  = demux_ogg_get_capabilities;
   this->demux_plugin.get_optional_data = demux_ogg_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
-  
+
   this->status = DEMUX_FINISHED;
 
 #ifdef HAVE_THEORA
   theora_info_init (&this->t_info);
   theora_comment_init (&this->t_comment);
-#endif  
+#endif
 
   this->chapter_info = 0;
   this->title = 0;
@@ -2042,7 +2042,7 @@
 }
 
 static demux_plugin_t *ogg_open_plugin (demux_class_t *class_gen,
-				        xine_stream_t *stream, 
+				        xine_stream_t *stream,
 				        input_plugin_t *input) {
 
   demux_ogg_t *this;
@@ -2067,13 +2067,13 @@
   this->demux_plugin.get_capabilities  = demux_ogg_get_capabilities;
   this->demux_plugin.get_optional_data = demux_ogg_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
-  
+
   this->status = DEMUX_FINISHED;
 
 #ifdef HAVE_THEORA
   theora_info_init (&this->t_info);
   theora_comment_init (&this->t_comment);
-#endif  
+#endif
 
   this->chapter_info = 0;
   this->title = 0;
@@ -2093,7 +2093,7 @@
   this->demux_class.open_plugin     = anx_open_plugin;
   this->demux_class.description     = N_("Annodex demux plugin");
   this->demux_class.identifier      = "Annodex";
-  this->demux_class.mimetypes       = 
+  this->demux_class.mimetypes       =
     "application/annodex: anx: Annodex media;"
     "application/x-annodex: anx: Annodex media;"
     "audio/annodex: axa: Annodex audio;"
@@ -2152,7 +2152,7 @@
 void *theora_init_plugin (xine_t *xine, void *data);
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class },
   { PLUGIN_DEMUX, 27, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class },
 #ifdef HAVE_VORBIS
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -174,10 +174,10 @@
       if ( !strncasecmp (speex_comment_keys[i].key, c,
 			 keylen) ) {
 	char meta_info[(len - keylen) + 1];
-	
+
 	lprintf ("known metadata %d %d\n",
 		 i, speex_comment_keys[i].xine_metainfo_index);
-	
+
 	strncpy(meta_info, &c[keylen], len-keylen);
 	_x_meta_info_set_utf8(this->stream, speex_comment_keys[i].xine_metainfo_index, meta_info);
       }
@@ -221,7 +221,7 @@
 	  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": invalid mode ID %u\n", modeID);
 	  return;
 	}
-	
+
 	spx_mode = (SpeexMode *) speex_mode_list[modeID];
 
 	if (spx_mode->bitstream_version != spx_header->mode_bitstream_version) {
@@ -243,7 +243,7 @@
 	this->channels = spx_header->nb_channels;
 	if (this->channels == 2) {
 	  SpeexCallback callback;
-	
+
 	  callback.callback_id = SPEEX_INBAND_STEREO;
 	  callback.func = speex_std_stereo_request_handler;
 	  callback.data = &this->stereo;
@@ -252,7 +252,7 @@
 
 	this->nframes = spx_header->frames_per_packet;
 	if (!this->nframes) this->nframes = 1;
-      
+
 	speex_decoder_ctl (this->st, SPEEX_GET_FRAME_SIZE, &this->frame_size);
 
 	speex_decoder_ctl (this->st, SPEEX_GET_BITRATE, &bitrate);
@@ -271,10 +271,10 @@
 
       if (!this->header_count) {
         int mode = _x_ao_channels2mode(this->channels);
-	
+
 	if (!this->output_open) {
 	  this->output_open =
-	    (this->stream->audio_out->open) (this->stream->audio_out, 
+	    (this->stream->audio_out->open) (this->stream->audio_out,
 					  this->stream,
 					  16,
 					  this->rate,
@@ -283,7 +283,7 @@
 	}
       }
     }
-    
+
   } else if (this->output_open) {
     int j;
 
@@ -322,9 +322,9 @@
       audio_buffer->vpts       = this->pts;
       this->pts=0;
       audio_buffer->num_frames = this->frame_size;
-	
+
       this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-	
+
       buf->pts=0;
 
     }
@@ -336,20 +336,20 @@
 
 static void speex_dispose (audio_decoder_t *this_gen) {
 
-  speex_decoder_t *this = (speex_decoder_t *) this_gen; 
-  
+  speex_decoder_t *this = (speex_decoder_t *) this_gen;
+
   if (this->st) {
     speex_decoder_destroy (this->st);
   }
   speex_bits_destroy (&this->bits);
 
-  if (this->output_open) 
+  if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
   free (this_gen);
 }
 
-static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, 
+static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
 				     xine_stream_t *stream) {
 
   speex_decoder_t *this ;
@@ -383,7 +383,7 @@
 void *speex_init_plugin (xine_t *xine, void *data) {
 
   speex_class_t *this;
-  
+
   this = (speex_class_t *) calloc(1, sizeof(speex_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
@@ -394,7 +394,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_SPEEX, 0
  };
 
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2001-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -101,17 +101,17 @@
 
   crop_offset=offset_x+yuv->y_stride*offset_y;
   for(i=0;i<frame->height;i++)
-    xine_fast_memcpy(frame->base[0]+frame->pitches[0]*i, 
-		     yuv->y+crop_offset+yuv->y_stride*i, 
+    xine_fast_memcpy(frame->base[0]+frame->pitches[0]*i,
+		     yuv->y+crop_offset+yuv->y_stride*i,
 		     frame->width);
 
   crop_offset=(offset_x/2)+(yuv->uv_stride)*(offset_y/2);
   for(i=0;i<frame->height/2;i++){
-    xine_fast_memcpy(frame->base[1]+frame->pitches[1]*i, 
-		     yuv->u+crop_offset+yuv->uv_stride*i, 
+    xine_fast_memcpy(frame->base[1]+frame->pitches[1]*i,
+		     yuv->u+crop_offset+yuv->uv_stride*i,
 		     frame->width/2);
-    xine_fast_memcpy(frame->base[2]+frame->pitches[2]*i, 
-		     yuv->v+crop_offset+yuv->uv_stride*i, 
+    xine_fast_memcpy(frame->base[2]+frame->pitches[2]*i,
+		     yuv->v+crop_offset+yuv->uv_stride*i,
 		     frame->width/2);
 
   }
@@ -123,7 +123,7 @@
 
   if (buf->decoder_flags & BUF_FLAG_FRAME_START) {
     this->done=0;  /*start from the beginnig*/
-    this->reject=0;/*new packet - new try*/ 
+    this->reject=0;/*new packet - new try*/
 
     /*copy the ogg_packet struct and the sum, correct the adress of the packet*/
     xine_fast_memcpy (&this->op, buf->content, sizeof(ogg_packet));
@@ -142,7 +142,7 @@
     }
     readin_op (this, buf->content, buf->size );
   }
-  
+
   if ((buf->decoder_flags & BUF_FLAG_FRAME_END) && !this->reject) {
     if ( this->done != this->op.bytes ) {
       printf ("libtheora: A packet changed its size during transfer - rejected\n");
@@ -156,8 +156,8 @@
 
 static void theora_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
   /*
-   * decode data from buf and feed decoded frames to 
-   * video output 
+   * decode data from buf and feed decoded frames to
+   * video output
    */
   theora_decoder_t *this = (theora_decoder_t *) this_gen;
   vo_frame_t *frame;
@@ -195,7 +195,7 @@
       }
       /*headers are now decoded. initialize the decoder*/
       theora_decode_init (&this->t_state, &this->t_info);
-      
+
       lprintf("theora stream is Theora %dx%d %.02f fps video.\n"
 	      "           frame content is %dx%d with offset (%d,%d).\n"
 	      "           pixel aspect is %d:%d.\n",
@@ -346,7 +346,7 @@
 void *theora_init_plugin (xine_t *xine, void *data) {
   /*initialize our plugin*/
   theora_class_t *this;
-  
+
   this = (theora_class_t *) calloc(1, sizeof(theora_class_t));
 
   this->decoder_class.open_plugin     = theora_open_plugin;
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -88,7 +88,7 @@
 
   /* clear block first, as it might contain allocated data */
   vorbis_block_clear(&this->vb);
-  vorbis_block_init(&this->vd,&this->vb);     
+  vorbis_block_init(&this->vd,&this->vb);
 }
 
 static void vorbis_discontinuity (audio_decoder_t *this_gen) {
@@ -146,8 +146,8 @@
 static void vorbis_check_bufsize (vorbis_decoder_t *this, int size) {
   if (size > this->bufsize) {
     this->bufsize = size + size / 2;
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-	    _("vorbis: increasing buffer to %d to avoid overflow.\n"), 
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+	    _("vorbis: increasing buffer to %d to avoid overflow.\n"),
 	    this->bufsize);
     this->buf = realloc(this->buf, this->bufsize);
   }
@@ -170,87 +170,87 @@
 
     /* reset accumultaion buffer */
     this->size = 0;
-  
+
     if ( (buf->decoder_flags & BUF_FLAG_HEADER) &&
         !(buf->decoder_flags & BUF_FLAG_STDHEADER) ) {
-  
+
       lprintf ("%d headers to go\n", this->header_count);
-  
+
       if (this->header_count) {
         int res = 0;
-  
+
         if (this->header_count == 3)
           this->op.b_o_s = 1;
-  
+
         if ( (res = vorbis_synthesis_headerin(&this->vi,&this->vc,&this->op)) < 0 ) {
           /* error case; not a vorbis header */
           xine_log(this->stream->xine, XINE_LOG_MSG, "libvorbis: this bitstream does not contain vorbis audio data. Following first 64 bytes (return: %d).\n", res);
           xine_hexdump((char *)this->op.packet, this->op.bytes < 64 ? this->op.bytes : 64);
           return;
         }
-  
+
         this->header_count--;
-  
+
         if (!this->header_count) {
-        
+
           int mode = AO_CAP_MODE_MONO;
-          
+
           get_metadata (this);
-  
+
           mode = _x_ao_channels2mode(this->vi.channels);
-          
+
           this->convsize=MAX_NUM_SAMPLES/this->vi.channels;
-          
+
           if (!this->output_open) {
-            this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, 
+            this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
                                                       this->stream,
                                                       16,
                                                       this->vi.rate,
                                                       mode) ;
-          
-            _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, 
+
+            _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE,
               this->vi.bitrate_nominal);
-          
+
           }
-  
+
           /* OK, got and parsed all three headers. Initialize the Vorbis
                   * packet->PCM decoder. */
           lprintf("all three headers parsed. initializing decoder.\n");
-          /* initialize central decode state */ 
-          vorbis_synthesis_init(&this->vd,&this->vi); 
+          /* initialize central decode state */
+          vorbis_synthesis_init(&this->vd,&this->vi);
           /* initialize local state for most of the decode so multiple
-            * block decodes can proceed in parallel. We could init 
+            * block decodes can proceed in parallel. We could init
             * multiple vorbis_block structures for vd here */
-          vorbis_block_init(&this->vd,&this->vb);      
+          vorbis_block_init(&this->vd,&this->vb);
         }
       }
-  
+
     } else if (this->output_open) {
-  
+
       float **pcm;
       int samples;
-  
-      if(vorbis_synthesis(&this->vb,&this->op)==0) 
+
+      if(vorbis_synthesis(&this->vb,&this->op)==0)
         vorbis_synthesis_blockin(&this->vd,&this->vb);
-  
+
       if (buf->pts!=0)
         this->pts=buf->pts;
-  
+
       while ((samples=vorbis_synthesis_pcmout(&this->vd,&pcm))>0){
-  
+
         /* **pcm is a multichannel float vector. In stereo, for
         * example, pcm[0][...] is left, and pcm[1][...] is right.
         * samples is the size of each channel. Convert the float
         * values (-1.<=range<=1.) to whatever PCM format and write
         * it out
         */
-  
+
         int i,j;
         int bout=(samples<this->convsize?samples:this->convsize);
         audio_buffer_t *audio_buffer;
-  
+
         audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
-        
+
         /* convert floats to 16 bit signed ints (host order) and
           interleave */
         for(i=0;i<this->vi.channels;i++){
@@ -269,15 +269,15 @@
             ptr+=this->vi.channels;
           }
         }
-  
+
         audio_buffer->vpts       = this->pts;
         this->pts=0;
         audio_buffer->num_frames = bout;
-  
+
         this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-  
+
         buf->pts=0;
-  
+
         /* tell libvorbis how many samples we actually consumed */
         vorbis_synthesis_read(&this->vd,bout);
       }
@@ -289,7 +289,7 @@
 
 static void vorbis_dispose (audio_decoder_t *this_gen) {
 
-  vorbis_decoder_t *this = (vorbis_decoder_t *) this_gen; 
+  vorbis_decoder_t *this = (vorbis_decoder_t *) this_gen;
 
   if( !this->header_count ) {
     lprintf("deinitializing decoder\n");
@@ -302,7 +302,7 @@
 
   vorbis_info_clear(&this->vi);  /* must be called last */
 
-  if (this->output_open) 
+  if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
   lprintf("libvorbis instance destroyed\n");
@@ -310,7 +310,7 @@
   free (this_gen);
 }
 
-static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, 
+static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
 				     xine_stream_t *stream) {
 
   vorbis_decoder_t *this ;
@@ -345,7 +345,7 @@
 void *vorbis_init_plugin (xine_t *xine, void *data) {
 
   vorbis_class_t *this;
-  
+
   this = (vorbis_class_t *) calloc(1, sizeof(vorbis_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
@@ -356,7 +356,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_VORBIS, 0
  };
 
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -12,7 +12,7 @@
 noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h demux_matroska.h iff.h flacutils.h  real_common.h
 
 if ENABLE_ASF
-asf_module = xineplug_dmx_asf.la 
+asf_module = xineplug_dmx_asf.la
 endif
 
 if ENABLE_MNG
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -256,7 +256,7 @@
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->type = BUF_VIDEO_4XM;
     if( this->filesize )
-      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                        65535 / this->filesize );
     buf->extra_info->input_time = this->video_pts / 90;
     buf->pts = this->video_pts;
@@ -271,7 +271,7 @@
       buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
       buf->type = BUF_VIDEO_4XM;
       if( this->filesize )
-        buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+        buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->filesize );
       buf->extra_info->input_time = this->video_pts / 90;
       buf->pts = this->video_pts;
@@ -320,7 +320,7 @@
       buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
       buf->type = this->tracks[current_track].audio_type;
       if( this->filesize )
-        buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+        buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->filesize );
       /* let the engine sort it out */
       buf->extra_info->input_time = 0;
@@ -354,7 +354,7 @@
     break;
 
   default:
-    lprintf("bad chunk: %c%c%c%c (%02X%02X%02X%02X)\n", 
+    lprintf("bad chunk: %c%c%c%c (%02X%02X%02X%02X)\n",
       header[0], header[1], header[2], header[3],
       header[0], header[1], header[2], header[3]);
     this->status = DEMUX_FINISHED;
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -103,7 +103,7 @@
     if ( this->input->read(this->input, peak, MAX_PREVIEW_SIZE) != MAX_PREVIEW_SIZE )
       return 0;
     this->input->seek(this->input, 0, SEEK_SET);
-  } else if (_x_demux_read_header(this->input, peak, MAX_PREVIEW_SIZE) != 
+  } else if (_x_demux_read_header(this->input, peak, MAX_PREVIEW_SIZE) !=
 	   MAX_PREVIEW_SIZE)
     return 0;
 
@@ -172,7 +172,7 @@
     buf->free_buffer(buf);
     this->status = DEMUX_FINISHED;
     return this->status;
-  } else 
+  } else
     buf->size = bytes_read;
 
   /* each buffer stands on its own */
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -307,7 +307,7 @@
     }
   } else {
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
-    buf->size = this->input->read(this->input, buf->content, 
+    buf->size = this->input->read(this->input, buf->content,
                                   this->frame_size);
   }
 
@@ -319,7 +319,7 @@
 
   buf->type = this->buf_type;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) current_stream_pos * 
+    buf->extra_info->input_normpos = (int)( (double) current_stream_pos *
                                      65535 / this->input->get_length (this->input) );
   buf->extra_info->input_time = audio_pts / 90;
   buf->pts = audio_pts;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -139,7 +139,7 @@
     }
     chunk_type = _X_BE_32(&preamble[0]);
     chunk_size = _X_BE_32(&preamble[4]);
-    
+
     if (chunk_type == COMM_TAG) {
       unsigned char buffer[100];
 
@@ -174,7 +174,7 @@
         (this->audio_bits / 8);
       this->running_time = (this->audio_frames / this->audio_sample_rate) * 1000;
 
-      /* we should send only complete frames to decoder, as it 
+      /* we should send only complete frames to decoder, as it
        * doesn't handle underconsumption yet */
       this->audio_block_align = PCM_BLOCK_ALIGN - PCM_BLOCK_ALIGN % (this->audio_bits / 8 * this->audio_channels);
 
@@ -210,7 +210,7 @@
   /* just load data chunks from wherever the stream happens to be
    * pointing; issue a DEMUX_FINISHED status if EOF is reached */
   remaining_sample_bytes = this->audio_block_align;
-  current_file_pos = 
+  current_file_pos =
     this->input->get_current_pos(this->input) - this->data_start;
 
   current_pts = current_file_pos;
@@ -258,7 +258,7 @@
 
     this->audio_fifo->put (this->audio_fifo, buf);
   }
-  
+
   return this->status;
 }
 
@@ -408,7 +408,7 @@
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("AIFF file demux plugin");
   this->demux_class.identifier      = "AIFF";
-  this->demux_class.mimetypes       = 
+  this->demux_class.mimetypes       =
     "audio/x-aiff: aif, aiff: AIFF audio;"
     "audio/aiff: aif, aiff: AIFF audio;"
     "audio/x-pn-aiff: aif, aiff: AIFF audio;";
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -88,13 +88,13 @@
   int                 skip;
   int                 resync;
   int                 first_seq;
-  
+
   int                 payload_size;
 
   /* palette handling */
   int                  palette_count;
   palette_entry_t      palette[256];
-  
+
 } asf_demux_stream_t;
 
 typedef struct demux_asf_s {
@@ -109,13 +109,13 @@
 
   int64_t            keyframe_ts;
   int                keyframe_found;
-  
+
   int                seqno;
   uint32_t           packet_size;
   uint8_t            packet_len_flags;
   uint32_t           data_size;
   uint64_t           packet_count;
-  
+
   asf_demux_stream_t streams[MAX_NUM_STREAMS];
   int                video_stream;
   int                audio_stream;
@@ -145,7 +145,7 @@
   int                reorder_b;
 
   int                buf_flag_seek;
-  
+
   /* first packet position */
   int64_t            first_packet_pos;
 
@@ -267,7 +267,7 @@
   for(i = 0; i < 8; i++) {
     g.Data4[i] = get_byte(this);
   }
-   
+
   return get_guid_id(this, &g);
 }
 
@@ -306,7 +306,7 @@
     this->status = DEMUX_FINISHED;
     return;
   }
-  
+
   memcpy (buf->content, wavex, asf_stream->private_data_length);
 
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, wavex->wFormatTag);
@@ -347,10 +347,10 @@
     this->status = DEMUX_FINISHED;
     return;
   }
-  
+
   buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
                          BUF_FLAG_FRAME_END;
-  
+
   buf->decoder_info[0] = 0;
 
   if (this->asf_header->aspect_ratios[stream].x && this->asf_header->aspect_ratios[stream].y)
@@ -369,7 +369,7 @@
 
   /* send off the palette, if there is one */
   if (demux_stream->palette_count) {
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
 	    "demux_asf: stream %d, palette : %d entries\n", stream, demux_stream->palette_count);
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->decoder_flags = BUF_FLAG_SPECIAL|BUF_FLAG_HEADER;
@@ -390,7 +390,7 @@
   asf_header_len = get_le64(this);
   if (asf_header_len > 4 * 1024 * 1024)
   {
-    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	    "demux_asf: asf_read_header: overly-large header? (%"PRIu64" bytes)\n",
 	    asf_header_len);
     return 0;
@@ -425,13 +425,13 @@
 
   this->packet_size = this->asf_header->file->packet_size;
   this->packet_count = this->asf_header->file->data_packet_count;
-  
+
   /* compute stream duration */
-  this->length = (this->asf_header->file->send_duration - 
+  this->length = (this->asf_header->file->send_duration -
                   this->asf_header->file->preroll) / 10000;
   if (this->length < 0)
     this->length = 0;
-    
+
   /* compute average byterate (needed for seeking) */
   if (this->asf_header->file->max_bitrate)
     this->rate = this->asf_header->file->max_bitrate >> 3;
@@ -473,14 +473,14 @@
 	this->reorder_w = (asf_stream->error_correction_data[2]<<8)|asf_stream->error_correction_data[1];
 	this->reorder_b = (asf_stream->error_correction_data[4]<<8)|asf_stream->error_correction_data[3];
 	this->reorder_w /= this->reorder_b;
-	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		"demux_asf: audio conceal interleave detected (%d x %d x %d)\n",
 		this->reorder_w, this->reorder_h, this->reorder_b );
       } else {
 	this->reorder_b = this->reorder_h = this->reorder_w = 1;
       }
-      
-      
+
+
       demux_stream->buf_type = _x_formattag_to_buf_audio
 	(	((xine_waveformatex *)asf_stream->private_data)->wFormatTag );
       if ( !demux_stream->buf_type ) {
[... 348 lines omitted ...]
     for (i=0; i<this->asf_header->stream_count; i++) {
       asf_demux_stream_t *asf_stream;
 
@@ -1759,7 +1759,7 @@
 
     asf_header_delete (this->asf_header);
   }
-  
+
   free (this);
 }
 
@@ -1819,11 +1819,11 @@
 	   start_pos, start_time);
 
   this->status = DEMUX_OK;
- 
+
   if (this->mode != ASF_MODE_NORMAL) {
     return this->status;
   }
-  
+
   /*
    * seek to start position
    */
@@ -1837,7 +1837,7 @@
   this->last_pts[PTS_AUDIO] = 0;
   this->keyframe_ts = 0;
   this->keyframe_found = 0;
-  
+
   /* engine sync stuff */
   this->send_newpts   = 1;
   this->buf_flag_seek = 1;
@@ -1845,11 +1845,11 @@
   if (this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) {
 
     _x_demux_flush_engine(this->stream);
-    
+
     start_time /= 1000;
     start_pos = (off_t) ( (double) start_pos / 65535 *
                 this->input->get_length (this->input) );
-    
+
     if ( (!start_pos) && (start_time))
       start_pos = start_time * this->rate;
 
@@ -1910,7 +1910,7 @@
         this->status = DEMUX_FINISHED;
         return this->status;
       }
-      
+
       for (this->frame = 0; this->frame < (this->nb_frames & 0x3f); this->frame++) {
         raw_id = get_byte(this); this->packet_size_left -= 1;
 
@@ -1919,7 +1919,7 @@
         stream_id = raw_id & 0x7f;
         if (asf_parse_packet_payload_common(this, raw_id, &stream, &frag_offset, &rlen))
           break;
-        
+
         if (rlen == 1) {
           if (asf_parse_packet_compressed_payload(this, stream, raw_id, frag_offset, &ts))
             break;
@@ -1927,7 +1927,7 @@
           if (asf_parse_packet_payload(this, stream, raw_id, frag_offset, rlen, &ts))
             break;
         }
-        
+
         if (state == 0) {
           if (this->keyframe_found) {
             if (this->audio_stream == -1) {
@@ -1977,12 +1977,12 @@
       this->streams[this->audio_stream].resync = 1;
       this->streams[this->audio_stream].skip   = 1;
     }
-  } else if (!playing && this->input->seek_time != NULL) {    
+  } else if (!playing && this->input->seek_time != NULL) {
     if (start_pos && !start_time)
       start_time = this->length * start_pos / 65535;
-      
+
     this->input->seek_time (this->input, start_time, SEEK_SET);
-    
+
     this->keyframe_ts = 0;
     this->keyframe_found = 0; /* means next keyframe */
     if (this->video_stream >= 0) {
@@ -2007,7 +2007,7 @@
     }
   }
   return this->status;
-  
+
 error:
   this->status = DEMUX_FINISHED;
   return this->status;
@@ -2118,7 +2118,7 @@
   this->demux_plugin.demux_class       = class_gen;
 
   this->status = DEMUX_FINISHED;
-  
+
   return &this->demux_plugin;
 }
 
@@ -2133,7 +2133,7 @@
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("ASF demux plugin");
   this->demux_class.identifier      = "ASF";
-  this->demux_class.mimetypes       = 
+  this->demux_class.mimetypes       =
     "video/x-ms-asf: asf: ASF stream;"
     "video/x-ms-wmv: wmv: Windows Media Video;"
     "audio/x-ms-wma: wma: Windows Media Audio;"
@@ -2156,7 +2156,7 @@
 static const demuxer_info_t demux_info_asf = {
   10                       /* priority */
 };
- 
+
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "asf", XINE_VERSION_CODE, &demux_info_asf, init_class },

diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -105,7 +105,7 @@
 anyway.
   if (header[11] == 1)
     this->audio_type = BUF_AUDIO_WESTWOOD;
-  else 
+  else
 #endif
   if (header[11] == 99)
     this->audio_type = BUF_AUDIO_VQA_IMA;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -7,12 +7,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -134,7 +134,7 @@
     uint32_t  dwReserved3;            /* must be 0 */
     avistdindex_entry *aIndex;
 } avistdindex_chunk;
-    
+
 
 /* Base Index Form 'indx' */
 typedef struct _avisuperindex_chunk {
@@ -150,7 +150,7 @@
     avisuperindex_entry *aIndex;      /* where are the ix## chunks */
     avistdindex_chunk **stdindex;     /* the ix## chunks itself (array) */
 } avisuperindex_chunk;
-    
+
 
 /* These next three are the video and audio structures that can grow
  * during the playback of a streaming file. */
@@ -473,7 +473,7 @@
     maxframe--;
   }
   return -1;
-} 
+}
 
 /* Use this one to ensure that a video frame with the given timestamp
  * is in the index. */
@@ -600,11 +600,11 @@
       }
     } else {
       int i;
-      
+
       /* Audio chunk */
       for(i = 0; i < this->avi->n_audio; ++i) {
         avi_audio_t *audio = this->avi->audio[i];
-  
+
         if ((data[0] == audio->audio_tag[0]) &&
             (data[1] == audio->audio_tag[1])) {
           off_t pos = chunk_pos + AVI_HEADER_SIZE;
@@ -617,7 +617,7 @@
           } else {
             audio->block_no += 1;
           }
-  
+
           if (audio_index_append(this->avi, i, pos, chunk_len, audio->audio_tot,
                                  audio->block_no) == -1) {
             /* As above. */
@@ -711,10 +711,10 @@
 
 static void reset_idx(demux_avi_t *this, avi_t *AVI) {
   int n;
-  
+
   this->idx_grow.nexttagoffset = AVI->movi_start;
   this->has_index = 0;
-  
+
   AVI->video_idx.video_frames = 0;
   for(n = 0; n < AVI->n_audio; n++) {
     AVI->audio[n]->audio_idx.audio_chunks = 0;
@@ -778,14 +778,14 @@
     n = _X_LE_32(data + 4);
     n = PAD_EVEN(n);
     next_chunk = this->idx_grow.nexttagoffset + 8 + n;
-    
+
     lprintf("chunk: %c%c%c%c, size: %" PRId64 "\n",
             data[0], data[1], data[2], data[3], (int64_t)n);
-    
+
     if (n >= 4 && strncasecmp(data,"LIST",4) == 0) {
       if( this->input->read(this->input, data,4) != 4 ) ERR_EXIT(AVI_ERR_READ);
       n -= 4;
-      
+
       lprintf("  chunk: %c%c%c%c\n",
               data[0], data[1], data[2], data[3]);
 
@@ -799,7 +799,7 @@
           ERR_EXIT(AVI_ERR_READ);
 
       } else if(strncasecmp(data,"movi",4) == 0)  {
-        
+
         AVI->movi_start = this->input->get_current_pos(this->input);
         AVI->movi_end = AVI->movi_start + n - 1;
 
@@ -877,7 +877,7 @@
         lasttag = 1; /* vids */
         lprintf("dwScale=%d, dwRate=%d, dwInitialFrames=%d, dwStart=%d, num_stream=%d\n",
                 AVI->dwScale, AVI->dwRate, AVI->dwInitialFrames, AVI->dwStart, num_stream);
-                
+
       } else if (strncasecmp (hdrl_data+i,"auds",4) ==0 /* && ! auds_strh_seen*/) {
         if(AVI->n_audio < MAX_AUDIO_STREAMS) {
           avi_audio_t *a = (avi_audio_t *) calloc(1, sizeof(avi_audio_t));
@@ -892,10 +892,10 @@
           a->dwScale         = _X_LE_32(hdrl_data + i + 20);
           a->dwRate          = _X_LE_32(hdrl_data + i + 24);
           a->dwStart         = _X_LE_32(hdrl_data + i + 28);
-          
+
           lprintf("dwScale=%d, dwRate=%d, dwInitialFrames=%d, dwStart=%d, num_stream=%d\n",
                   a->dwScale, a->dwRate, a->dwInitialFrames, a->dwStart, num_stream);
-          
+
           a->dwSampleSize  = _X_LE_32(hdrl_data + i + 44);
[... 183 lines omitted ...]
 
         buf->type = audio->audio_type | audio_stream;
@@ -1783,7 +1783,7 @@
         /* read video */
         buf->pts = video_pts;
         lprintf("video pts: %" PRId64 "\n", video_pts);
-        
+
         if (left > this->video_fifo->buffer_pool_buf_size) {
           buf->size = this->video_fifo->buffer_pool_buf_size;
           buf->decoder_flags = 0;
@@ -1838,7 +1838,7 @@
       this->seek_request = 0;
       demux_avi_seek_internal(this);
     }
-    
+
     if (!demux_avi_next (this, 0)) {
       this->status = DEMUX_FINISHED;
     }
@@ -1923,7 +1923,7 @@
     this->avi->bih->biCompression = this->avi->compressor;
     this->avi->video_type = BUF_VIDEO_XVID;
   }
-  
+
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, !this->no_audio);
   _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name(this->avi->video_type));
@@ -1941,7 +1941,7 @@
     _x_demux_control_start (this->stream);
 
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-    
+
     if (this->avi->bih->biSize > buf->max_size) {
       xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
               "demux_avi: private video decoder data length (%d) is greater than fifo buffer length (%d)\n",
@@ -1950,9 +1950,9 @@
       this->status = DEMUX_FINISHED;
       return;
     }
-    
+
     /* wait, before sending out the video header, one more special case hack:
-     * if the video type is RGB, indicate that it is upside down with a 
+     * if the video type is RGB, indicate that it is upside down with a
      * negative height */
     if (this->avi->video_type == BUF_VIDEO_RGB) {
       this->avi->bih->biHeight = -this->avi->bih->biHeight;
@@ -1963,7 +1963,7 @@
     buf->decoder_info[0] = this->video_step;
     memcpy (buf->content, this->avi->bih, this->avi->bih->biSize);
     buf->size = this->avi->bih->biSize;
-    
+
     if (this->avi->video_type) {
       this->avi->compressor = this->avi->bih->biCompression;
     } else {
@@ -2013,7 +2013,7 @@
             buf->size = todo;
           }
           todo -= buf->size;
-  
+
           buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER;
           if (todo == 0)
             buf->decoder_flags |= BUF_FLAG_FRAME_END;
@@ -2030,7 +2030,7 @@
       }
 
       if(this->avi->n_audio == 1)
-        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, 
+        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC,
                              this->avi->audio[0]->wavex->wFormatTag);
     }
 
@@ -2080,7 +2080,7 @@
   int64_t              audio_pts;
   off_t                start_pos = this->seek_start_pos;
   int                  start_time = this->seek_start_time;
-  
+
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->input->get_length (this->input) );
 
@@ -2115,12 +2115,12 @@
     video_pts = start_time * 90;
     idx_grow(this, start_time_stopper, &video_pts);
   }
-  
+
   if (start_pos || start_time)
     max_pos = this->avi->video_idx.video_frames - 1;
   else
     max_pos=0;
-  
+
   cur_pos = this->avi->video_posf;
   if (max_pos < 0) {
     this->status = DEMUX_FINISHED;
@@ -2148,7 +2148,7 @@
       }
     }
   }
-  
+
   while (vie && !(vie->flags & AVIIF_KEYFRAME) && cur_pos) {
     this->avi->video_posf = --cur_pos;
     vie = video_cur_index_entry(this);
@@ -2171,7 +2171,7 @@
   if (!this->no_audio && this->status == DEMUX_OK) {
     audio_index_entry_t *aie;
     int i;
-    
+
     for(i = 0; i < this->avi->n_audio; i++) {
       max_pos = this->avi->audio[i]->audio_idx.audio_chunks - 1;
       min_pos = 0;
@@ -2329,7 +2329,7 @@
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("AVI/RIFF demux plugin");
   this->demux_class.identifier      = "AVI";
-  this->demux_class.mimetypes       = 
+  this->demux_class.mimetypes       =
     "video/msvideo: avi: AVI video;"
     "video/x-msvideo: avi: AVI video;";
   this->demux_class.extensions      = "avi";

diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -84,7 +84,7 @@
 
   buf->type = BUF_AUDIO_LPCM_LE;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
   buf->pts = this->input->get_current_pos(this->input);
   buf->pts *= 90000;
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -160,7 +160,7 @@
 	break;
     }
     /* 14 bits and little endian bitstream */
-    else if ((syncword == 0xff1f00e8) && 
+    else if ((syncword == 0xff1f00e8) &&
              ((peak[i] & 0xf0) == 0xf0) && (peak[i+1] == 0x07)) {
 	dts_version = 3;
 	break;
@@ -218,8 +218,8 @@
     {
     case 0: /* BE16 */
     case 1: /* LE16 */
-    	this->frame_size = fsize * 8 / 16 * 2;
-    	break;
+	this->frame_size = fsize * 8 / 16 * 2;
+	break;
     case 2: /* BE14 */
     case 3: /* LE14 */
 	this->frame_size = fsize * 8 / 14 * 2;
@@ -250,7 +250,7 @@
   int frame_number;
   uint32_t blocksize;
 
-  current_stream_pos = this->input->get_current_pos(this->input) - 
+  current_stream_pos = this->input->get_current_pos(this->input) -
                        this->data_start;
   frame_number = current_stream_pos / this->frame_size;
 
@@ -274,7 +274,7 @@
     }
   } else {
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
-    buf->size = this->input->read(this->input, buf->content, 
+    buf->size = this->input->read(this->input, buf->content,
                                   this->frame_size);
   }
 
@@ -286,7 +286,7 @@
 
   buf->type = BUF_AUDIO_DTS;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) current_stream_pos * 
+    buf->extra_info->input_normpos = (int)( (double) current_stream_pos *
         65535 / (this->input->get_length(this->input) - this->data_start) );
   buf->extra_info->input_time = audio_pts / 90;
   buf->pts = audio_pts;
@@ -360,7 +360,7 @@
   if (start_time) {
     int length = demux_dts_get_stream_length (this_gen);
     if (length != 0) {
-      start_pos = start_time * 
+      start_pos = start_time *
           (this->input->get_length(this->input) - this->data_start) / length;
     }
   }
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -213,7 +213,7 @@
         buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo);
         buf->type = BUF_AUDIO_EA_ADPCM;
         if( this->input->get_length (this->input) )
-          buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+          buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                            65535 / this->input->get_length (this->input) );
         buf->extra_info->input_time = (int)((int64_t)this->sample_counter * 1000 / 22050);
         buf->pts = this->sample_counter;
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -46,7 +46,7 @@
 #define NUM_PREVIEW_BUFFERS 50
 #define SCRATCH_SIZE 256
 
-typedef struct {  
+typedef struct {
   demux_plugin_t      demux_plugin;
 
   xine_stream_t       *stream;
@@ -83,7 +83,7 @@
   buf->content               = buf->mem;
   buf->pts                   = 0;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
   buf->type                  = BUF_VIDEO_MPEG;
 
@@ -91,7 +91,7 @@
     buf->decoder_flags = BUF_FLAG_PREVIEW;
 
   this->video_fifo->put(this->video_fifo, buf);
-  
+
   return 1;
 }
 
@@ -269,7 +269,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -163,7 +163,7 @@
     film->version[3]);
 
   /* load the rest of the FILM header */
-  if (film->input->read(film->input, film_header, film_header_size) != 
+  if (film->input->read(film->input, film_header, film_header_size) !=
     film_header_size) {
     free (film->interleave_buffer);
     free (film->sample_table);
@@ -206,7 +206,7 @@
         _x_report_video_fourcc (film->stream->xine, LOG_MODULE,
 				*(uint32_t *)&film_header[i + 8]);
       }
-      
+
       /* fetch the audio information if the chunk size checks out */
       if (chunk_size == 32) {
         film->audio_channels = film_header[21];
@@ -391,7 +391,7 @@
   }
 
   /* check if we're only sending audio samples until the next keyframe */
-  if ((this->waiting_for_keyframe) && 
+  if ((this->waiting_for_keyframe) &&
       (!this->sample_table[i].audio)) {
     if (this->sample_table[i].keyframe) {
       this->waiting_for_keyframe = 0;
@@ -431,7 +431,7 @@
       /* set the frame duration */
       buf->decoder_flags |= BUF_FLAG_FRAMERATE;
       buf->decoder_info[0] = this->sample_table[i].duration;
-            
+
       if (remaining_sample_bytes > buf->max_size)
         buf->size = buf->max_size;
       else
@@ -446,11 +446,11 @@
         }
 
         /* skip over the extra non-spec CVID bytes */
-        this->input->seek(this->input, 
+        this->input->seek(this->input,
           this->sample_table[i].sample_size - cvid_chunk_size, SEEK_CUR);
 
         /* load the rest of the chunk */
-        if (this->input->read(this->input, buf->content + 10, 
+        if (this->input->read(this->input, buf->content + 10,
           buf->size - 10) != buf->size - 10) {
           buf->free_buffer(buf);
           this->status = DEMUX_FINISHED;
@@ -502,7 +502,7 @@
       /* set the frame duration */
       buf->decoder_flags |= BUF_FLAG_FRAMERATE;
       buf->decoder_info[0] = this->sample_table[i].duration;
-            
+
       if (remaining_sample_bytes > buf->max_size)
         buf->size = buf->max_size;
       else
@@ -630,8 +630,8 @@
           buf->content[j] =     this->interleave_buffer[k];
           buf->content[j + 1] = this->interleave_buffer[k + 1];
         }
-        for (j = 2, 
-             k = interleave_index + this->sample_table[i].sample_size / 2; 
+        for (j = 2,
+             k = interleave_index + this->sample_table[i].sample_size / 2;
              j < buf->size; j += 4, k += 2) {
           buf->content[j] =     this->interleave_buffer[k];
           buf->content[j + 1] = this->interleave_buffer[k + 1];
@@ -641,8 +641,8 @@
         for (j = 0, k = interleave_index; j < buf->size; j += 2, k += 1) {
           buf->content[j] = this->interleave_buffer[k] += 0x80;
         }
-        for (j = 1, 
-             k = interleave_index + this->sample_table[i].sample_size / 2; 
+        for (j = 1,
+             k = interleave_index + this->sample_table[i].sample_size / 2;
              j < buf->size; j += 2, k += 1) {
           buf->content[j] = this->interleave_buffer[k] += 0x80;
         }
@@ -657,7 +657,7 @@
       this->audio_fifo->put(this->audio_fifo, buf);
     }
   }
-  
+
   return this->status;
 }
 
@@ -740,13 +740,13 @@
     this->waiting_for_keyframe = 0;
     this->last_sample = 0;
   }
-    
+
   /* if input is non-seekable, do not proceed with the rest of this
    * seek function */
   if (!INPUT_IS_SEEKABLE(this->input))
     return this->status;
 
-  /* perform a binary search on the sample table, testing the offset 
+  /* perform a binary search on the sample table, testing the offset
    * boundaries first */
   if (start_pos) {
     if (start_pos <= 0)
@@ -763,7 +763,7 @@
       while (!found) {
         middle = (left + right) / 2;
         if ((start_pos >= this->sample_table[middle].sample_offset) &&
-            (start_pos <= this->sample_table[middle].sample_offset + 
+            (start_pos <= this->sample_table[middle].sample_offset +
              this->sample_table[middle].sample_size)) {
           found = 1;
         } else if (start_pos < this->sample_table[middle].sample_offset) {
@@ -820,7 +820,7 @@
   }
 
   this->current_sample = best_index;
-  
+
   return this->status;
 }
 
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -119,7 +119,7 @@
    * will always be 1 metadata block */
   do {
 
-    if (flac->input->read(flac->input, preamble, FLAC_SIGNATURE_SIZE) != 
+    if (flac->input->read(flac->input, preamble, FLAC_SIGNATURE_SIZE) !=
         FLAC_SIGNATURE_SIZE)
       return 0;
 
@@ -133,11 +133,11 @@
     case 0:
       lprintf ("STREAMINFO metadata\n");
       if (block_length != FLAC_STREAMINFO_SIZE) {
-        lprintf ("expected STREAMINFO chunk of %d bytes\n", 
+        lprintf ("expected STREAMINFO chunk of %d bytes\n",
           FLAC_STREAMINFO_SIZE);
         return 0;
       }
-      if (flac->input->read(flac->input, 
+      if (flac->input->read(flac->input,
         flac->streaminfo + sizeof(xine_waveformatex),
         FLAC_STREAMINFO_SIZE) != FLAC_STREAMINFO_SIZE)
         return 0;
@@ -146,8 +146,8 @@
       flac->bits_per_sample = ((flac->sample_rate >> 4) & 0x1F) + 1;
       flac->sample_rate >>= 12;
       flac->total_samples = _X_BE_64(&streaminfo[10]) & UINT64_C(0x0FFFFFFFFF);  /* 36 bits */
-      lprintf ("%d Hz, %d bits, %d channels, %"PRId64" total samples\n", 
-        flac->sample_rate, flac->bits_per_sample, 
+      lprintf ("%d Hz, %d bits, %d channels, %"PRId64" total samples\n",
+        flac->sample_rate, flac->bits_per_sample,
         flac->channels, flac->total_samples);
       break;
 
@@ -178,7 +178,7 @@
         lprintf (" %d: sample %"PRId64", ", i, flac->seekpoints[i].sample_number);
         flac->seekpoints[i].offset = _X_BE_64(&buffer[8]);
         flac->seekpoints[i].size = _X_BE_16(&buffer[16]);
-        lprintf ("@ 0x%"PRIX64", size = %d bytes, ", 
+        lprintf ("@ 0x%"PRIX64", size = %d bytes, ",
           flac->seekpoints[i].offset, flac->seekpoints[i].size);
         flac->seekpoints[i].pts = flac->seekpoints[i].sample_number;
         flac->seekpoints[i].pts *= 90000;
@@ -187,7 +187,7 @@
       }
       break;
 
-    /* VORBIS_COMMENT 
+    /* VORBIS_COMMENT
      *
      * For a description of the format please have a look at
      * http://www.xiph.org/vorbis/doc/v-comment.html */
@@ -228,7 +228,7 @@
 
             lprintf ("comment[%02d] = %s\n", cn, comment);
 
-            if ((strncasecmp ("TITLE=", comment, 6) == 0) 
+            if ((strncasecmp ("TITLE=", comment, 6) == 0)
                 && (length - 6 > 0)) {
               _x_meta_info_set_utf8 (flac->stream, XINE_META_INFO_TITLE, comment + 6);
             } else if ((strncasecmp ("ARTIST=", comment, 7) == 0)
@@ -396,7 +396,7 @@
   int seekpoint_index = 0;
   int64_t start_pts;
   unsigned char buf[4];
-  
+
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );
 
@@ -457,9 +457,9 @@
     }
 
     _x_demux_flush_engine(this->stream);
-    this->input->seek(this->input, this->seekpoints[seekpoint_index].offset, 
+    this->input->seek(this->input, this->seekpoints[seekpoint_index].offset,
       SEEK_SET);
-    _x_demux_control_newpts(this->stream, 
+    _x_demux_control_newpts(this->stream,
       this->seekpoints[seekpoint_index].pts, BUF_FLAG_SEEK);
   }
 
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -112,7 +112,7 @@
 
   this->speed = _X_LE_32(&this->fli_header[16]);
   if (this->magic_number == FLI_FILE_MAGIC_1) {
-    /* 
+    /*
      * in this case, the speed (n) is number of 1/70s ticks between frames:
      *
      *  xine pts     n * frame #
@@ -123,7 +123,7 @@
      */
      this->frame_pts_inc = this->speed * 1285.7;
   } else if (this->magic_number == FLI_FILE_MAGIC_2) {
-    /* 
+    /*
      * in this case, the speed (n) is number of milliseconds between frames:
      *
      *  xine pts     n * frame #
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -20,7 +20,7 @@
 
 /*
  * Flash Video (.flv) File Demuxer
- *   by Mike Melanson (melanson@...) and 
+ *   by Mike Melanson (melanson@...) and
  *      Claudio Ciccani (klan@...)
  *
  * For more information on the FLV file format, visit:
@@ -67,28 +67,28 @@
   unsigned char        flags;
   off_t                start;  /* in bytes */
   off_t                size;   /* in bytes */
-  
+
   unsigned char        got_video_header;
   unsigned char        got_audio_header;
-  
+
   unsigned int         length; /* in ms */
   int                  width;
   int                  height;
   int                  duration;
   int                  videocodec;
-  
+
   int                  samplerate;
   int                  samplesize;
   int                  stereo;
   int                  audiocodec;
-  
+
   off_t                filesize;
-  
+
   flv_index_entry_t   *index;
   unsigned int         num_indices;
-  
+
   unsigned int         cur_pts;
-  
+
   int64_t              last_pts[2];
   int                  send_newpts;
   int                  buf_flag_seek;
@@ -178,7 +178,7 @@
 
   if ((buffer[0] != 'F') || (buffer[1] != 'L') || (buffer[2] != 'V'))
     return 0;
-    
+
   if (buffer[3] != 0x01) {
     xprintf(this->xine, XINE_VERBOSITY_LOG,
       _("unsupported FLV version (%d).\n"), buffer[3]);
@@ -194,10 +194,10 @@
 
   this->start = _X_BE_32(&buffer[5]);
   this->size = this->input->get_length(this->input);
-   
+
   this->input->seek(this->input, this->start, SEEK_SET);
-  
-  lprintf("  qualified FLV file, repositioned @ offset 0x%" PRIxMAX "\n", 
+
+  lprintf("  qualified FLV file, repositioned @ offset 0x%" PRIxMAX "\n",
           (intmax_t)this->start);
 
   return 1;
@@ -209,19 +209,19 @@
   _tmp.d;\
 })\
 
-static int parse_flv_var(demux_flv_t *this, 
+static int parse_flv_var(demux_flv_t *this,
                          unsigned char *buf, int size, char *key, int keylen) {
   unsigned char *tmp = buf;
   unsigned char *end = buf + size;
   char          *str;
   unsigned char  type;
   unsigned int   len, num;
-  
+
   if (size < 1)
     return 0;
-  
+
   type = *tmp++;
-  
+
   switch (type) {
     case FLV_DATA_TYPE_NUMBER:
       lprintf("  got number (%f)\n", BE_F64(tmp));
@@ -366,7 +366,7 @@
       lprintf("  got type %d\n", type);
       break;
   }
-  
+
   return (tmp - buf);
 }
 
@@ -375,7 +375,7 @@
   unsigned char *tmp = buf;
   unsigned char *end = buf + size;
   int            len;
-  
+
   if (!buf || this->input->read(this->input, buf, size ) != size) {
     this->status = DEMUX_FINISHED;
     free(buf);
@@ -388,7 +388,7 @@
       break;
     tmp += len;
   }
-  
+
   free(buf);
 }
 
@@ -401,7 +401,7 @@
   unsigned int   buf_type = 0;
   unsigned int   buf_flags = 0;
   unsigned int   pts;
- 
+
[... 207 lines omitted ...]
@@ -771,16 +771,16 @@
   }
   else if (seek_pos && this->videocodec && abs(seek_pts-this->cur_pts) > 300000) {
     off_t pos, size;
-    
+
     pos = this->input->get_current_pos(this->input);
     size = this->filesize ? : this->input->get_length(this->input);
     this->input->seek(this->input, (uint64_t)size * seek_pos / 65535, SEEK_SET);
     lprintf("  resyncing...\n");
-    
+
     /* resync */
     for (i = 0; i < 200000; i++) {
       uint8_t buf[4];
-      
+
       if (this->input->read(this->input, buf, 1) < 1) {
         this->status = DEMUX_FINISHED;
         return;
@@ -800,30 +800,30 @@
         this->input->seek(this->input, -11, SEEK_CUR);
       }
     }
-    
+
     lprintf("  ...resync failed!\n");
     this->input->seek(this->input, pos, SEEK_SET);
-  }  
-  else if (seek_pts) { 
+  }
+  else if (seek_pts) {
     while (do_rewind ? (seek_pts < this->cur_pts) : (seek_pts > this->cur_pts)) {
       unsigned char tag_type;
       int           data_size;
       int           ptag_size;
-    
+
       if (next_tag)
         this->input->seek(this->input, next_tag, SEEK_CUR);
-    
+
       len = this->input->read(this->input, buffer, 16);
       if (len != 16) {
         len = (len < 0) ? 0 : len;
         break;
       }
-        
+
       ptag_size = _X_BE_32(&buffer[0]);
       tag_type = buffer[4];
       data_size = _X_BE_24(&buffer[5]);
       pts = _X_BE_24(&buffer[8]) | (buffer[11] << 24);
-    
+
       if (do_rewind) {
         if (!ptag_size)
           break; /* beginning of movie */
@@ -832,7 +832,7 @@
       else {
         next_tag = data_size - 1;
       }
-   
+
       if (this->flags & FLV_FLAG_HAS_VIDEO) {
         /* sync to video key frame */
         if (tag_type != FLV_TAG_TYPE_VIDEO || (buffer[15] >> 4) != 0x01)
@@ -841,10 +841,10 @@
       }
       this->cur_pts = pts;
     }
-  
+
     /* seek back to the beginning of the tag */
     this->input->seek(this->input, -len, SEEK_CUR);
-  
+
     lprintf( "  seeked to %d.\n", pts);
   }
 }
@@ -852,7 +852,7 @@
 
 static int demux_flv_send_chunk(demux_plugin_t *this_gen) {
   demux_flv_t *this = (demux_flv_t *) this_gen;
-  
+
   return read_flv_packet(this, 0);
 }
 
@@ -864,11 +864,11 @@
   this->audio_fifo  = this->stream->audio_fifo;
 
   this->status = DEMUX_OK;
-  
+
   this->buf_flag_seek = 1;
 
   /* load stream information */
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 
+  _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO,
                     (this->flags & FLV_FLAG_HAS_VIDEO) ? 1 : 0);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO,
                     (this->flags & FLV_FLAG_HAS_AUDIO) ? 1 : 0);
@@ -897,7 +897,7 @@
 
   if (INPUT_IS_SEEKABLE(this->input)) {
     if (start_pos && !start_time) {
-      if (this->length) 
+      if (this->length)
         start_time = (int64_t) this->length * start_pos / 65535;
       else if (this->index)
         start_time = this->index[(int)(start_pos * (this->num_indices-1) / 65535)].pts;
@@ -905,13 +905,13 @@
 
     if (!this->length || start_time < this->length) {
       seek_flv_file(this, start_pos, start_time);
-    
+
       if (playing) {
         this->buf_flag_seek = 1;
         _x_demux_flush_engine(this->stream);
       }
     }
-  }  
+  }
 
   return this->status;
 }

diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -328,7 +328,7 @@
   this->input->seek(this->input, IDCIN_HEADER_SIZE, SEEK_SET);
 
   /* read the Huffman table */
-  if (this->input->read(this->input, huffman_table, HUFFMAN_TABLE_SIZE) != 
+  if (this->input->read(this->input, huffman_table, HUFFMAN_TABLE_SIZE) !=
     HUFFMAN_TABLE_SIZE)
     return 0;
 
@@ -347,7 +347,7 @@
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
     this->wave.wBitsPerSample);
 
-  this->filesize = this->input->get_length(this->input) - 
+  this->filesize = this->input->get_length(this->input) -
     IDCIN_HEADER_SIZE - HUFFMAN_TABLE_SIZE;
 
   return 1;
@@ -434,7 +434,7 @@
     this->status = DEMUX_OK;
 
     /* reposition stream past the Huffman tables */
-    this->input->seek(this->input, IDCIN_HEADER_SIZE + HUFFMAN_TABLE_SIZE, 
+    this->input->seek(this->input, IDCIN_HEADER_SIZE + HUFFMAN_TABLE_SIZE,
       SEEK_SET);
 
     this->pts_counter = 0;
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2003-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -82,7 +82,7 @@
   } else {
     this->status = DEMUX_OK;
   }
-  
+
   if (preview)
     buf->decoder_flags = BUF_FLAG_PREVIEW;
 
@@ -193,7 +193,7 @@
   this->demux_plugin.get_capabilities  = demux_image_get_capabilities;
   this->demux_plugin.get_optional_data = demux_image_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
-  
+
   this->status = DEMUX_FINISHED;
   this->buf_type = buf_type;
 
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -183,7 +183,7 @@
   while ((chunk_size > 0) && (chunk_type != CHUNK_BAD)) {
 
     /* read the next chunk, wherever the file happens to be pointing */
-    if (this->input->read(this->input, opcode_preamble, 
+    if (this->input->read(this->input, opcode_preamble,
       OPCODE_PREAMBLE_SIZE) != OPCODE_PREAMBLE_SIZE) {
       chunk_type = CHUNK_BAD;
       break;
@@ -221,7 +221,7 @@
           chunk_type = CHUNK_BAD;
           break;
         }
-        if (this->input->read(this->input, scratch, opcode_size) != 
+        if (this->input->read(this->input, scratch, opcode_size) !=
           opcode_size) {
           chunk_type = CHUNK_BAD;
           break;
@@ -239,7 +239,7 @@
           chunk_type = CHUNK_BAD;
           break;
         }
-        if (this->input->read(this->input, scratch, opcode_size) != 
+        if (this->input->read(this->input, scratch, opcode_size) !=
           opcode_size) {
           chunk_type = CHUNK_BAD;
           break;
@@ -275,7 +275,7 @@
           chunk_type = CHUNK_BAD;
           break;
         }
-        if (this->input->read(this->input, scratch, opcode_size) != 
+        if (this->input->read(this->input, scratch, opcode_size) !=
           opcode_size) {
           chunk_type = CHUNK_BAD;
           break;
@@ -336,23 +336,23 @@
               buf->extra_info->input_normpos = (int)( (double) current_file_pos * 65535 / this->data_size);
             buf->extra_info->input_time = audio_pts / 90;
             buf->pts = audio_pts;
-  
+
             if (opcode_size > buf->max_size)
               buf->size = buf->max_size;
             else
               buf->size = opcode_size;
             opcode_size -= buf->size;
-  
+
             if (this->input->read(this->input, buf->content, buf->size) !=
               buf->size) {
               buf->free_buffer(buf);
               chunk_type = CHUNK_BAD;
               break;
             }
-  
+
             if (!opcode_size)
               buf->decoder_flags |= BUF_FLAG_FRAME_END;
-  
+
             this->audio_fifo->put (this->audio_fifo, buf);
           }
         }else{
@@ -377,7 +377,7 @@
 
       case OPCODE_SET_PALETTE:
         lprintf("set palette\n");
-        /* check for the logical maximum palette size 
+        /* check for the logical maximum palette size
          * (3 * 256 + 4 bytes) */
         if (opcode_size > 0x304) {
           lprintf("set_palette opcode too large\n");
diff --git a/src/demuxers/demux_matroska-chapters.c b/src/demuxers/demux_matroska-chapters.c
--- a/src/demuxers/demux_matroska-chapters.c
+++ b/src/demuxers/demux_matroska-chapters.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2009 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -59,7 +59,7 @@
 
   if ((track->track_type == MATROSKA_TRACK_VIDEO) ||
       (track->track_type == MATROSKA_TRACK_AUDIO)) {
-  
+
     diff = pts - track->last_pts;
 
     if (pts && (this->send_newpts || (track->last_pts && abs(diff)>WRAP_THRESHOLD)) ) {
@@ -410,9 +410,9 @@
 
 static void init_codec_video(demux_matroska_t *this, matroska_track_t *track) {
   buf_element_t *buf;
-  
+
   buf = track->fifo->buffer_pool_alloc (track->fifo);
-  
+
   if (track->codec_private_len > buf->max_size) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
@@ -429,20 +429,20 @@
     xine_fast_memcpy (buf->content, track->codec_private, buf->size);
   else
     buf->content = NULL;
-  
+
   if(track->default_duration) {
     buf->decoder_flags   |= BUF_FLAG_FRAMERATE;
-    buf->decoder_info[0]  = (int64_t)track->default_duration * 
+    buf->decoder_info[0]  = (int64_t)track->default_duration *
                             (int64_t)90 / (int64_t)1000000;
   }
-  
-  if(track->video_track && track->video_track->display_width && 
+
+  if(track->video_track && track->video_track->display_width &&
      track->video_track->display_height) {
     buf->decoder_flags   |= BUF_FLAG_ASPECT;
     buf->decoder_info[1]  = track->video_track->display_width;
     buf->decoder_info[2]  = track->video_track->display_height;
   }
-    
+
   track->fifo->put (track->fifo, buf);
 }
 
@@ -460,7 +460,7 @@
     return;
   }
   buf->size = track->codec_private_len;
-  
+
   /* default param */
   buf->decoder_info[0] = 0;
   buf->decoder_info[1] = 44100;
@@ -492,9 +492,9 @@
 
 static void init_codec_real(demux_matroska_t *this, matroska_track_t * track) {
   buf_element_t *buf;
-  
+
   buf = track->fifo->buffer_pool_alloc (track->fifo);
-  
+
   if (track->codec_private_len > buf->max_size) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
@@ -502,30 +502,30 @@
     buf->free_buffer(buf);
     return;
   }
-  
+
   buf->size          = track->codec_private_len;
   buf->decoder_flags = BUF_FLAG_HEADER | BUF_FLAG_FRAME_END;
   buf->type          = track->buf_type;
   buf->pts           = 0;
-    
+
   if (buf->size)
     xine_fast_memcpy (buf->content, track->codec_private, buf->size);
   else
     buf->content = NULL;
-  
+
   if(track->default_duration) {
     buf->decoder_flags   |= BUF_FLAG_FRAMERATE;
-    buf->decoder_info[0]  = (int64_t)track->default_duration * 
+    buf->decoder_info[0]  = (int64_t)track->default_duration *
                             (int64_t)90 / (int64_t)1000000;
   }
-  
-  if(track->video_track && track->video_track->display_width && 
+
+  if(track->video_track && track->video_track->display_width &&
      track->video_track->display_height) {
     buf->decoder_flags   |= BUF_FLAG_ASPECT;
     buf->decoder_info[1]  = track->video_track->display_width;
     buf->decoder_info[2]  = track->video_track->display_height;
   }
-    
[... 316 lines omitted ...]
       case MATROSKA_ID_SEEKHEAD:
         lprintf("SeekHead\n");
@@ -2460,7 +2460,7 @@
     if (!ebml_skip(ebml, &elem))
       return 0;
   }
-  
+
   if (next_level)
     *next_level = ebml_get_next_level(ebml, &elem);
 
@@ -2547,12 +2547,12 @@
   if (this->segment.id == MATROSKA_ID_SEGMENT) {
     int res;
     int next_level;
-    
+
     lprintf("Segment detected\n");
 
     if (!ebml_read_master (ebml, &this->segment))
       return 0;
-    
+
     res = 1;
     next_level = 1;
     /* stop the loop on the first cluster */
@@ -2604,14 +2604,14 @@
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, (this->num_video_tracks != 0));
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->num_audio_tracks != 0));
 
-    
+
   /*
    * send preview buffers
    */
 
   /* enter in the segment */
   ebml_read_master (this->ebml, &this->segment);
-  
+
   /* seek back to the beginning of the segment */
   next_level = 1;
   if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) {
@@ -2621,7 +2621,7 @@
     this->status = DEMUX_FINISHED;
     return;
   }
-  
+
   this->preview_sent = 0;
   this->preview_mode = 1;
 
@@ -2707,7 +2707,7 @@
   matroska_index_t *index;
   matroska_track_t *track;
   int i, entry;
-  
+
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->input->get_length (this->input) );
 
@@ -2763,10 +2763,10 @@
             index->track_num, start_pos ? "pos" : "time",
             start_pos ? (intmax_t)start_pos : (intmax_t)start_time,
             index->track_num, index->timecode[entry], (intmax_t)index->pos[entry]);
-    
+
     if (this->input->seek(this->input, index->pos[entry], SEEK_SET) < 0)
       this->status = DEMUX_FINISHED;
-    
+
     /* we always seek to the ebml level 1 */
     this->ebml->level = 1;
 
@@ -2780,7 +2780,7 @@
 
 
 static void demux_matroska_dispose (demux_plugin_t *this_gen) {
-  
+
   demux_matroska_t *this = (demux_matroska_t *) this_gen;
   int i;
 
@@ -2796,7 +2796,7 @@
     free (track->video_track);
     free (track->audio_track);
     free (track->sub_track);
-    
+
     free (track);
   }
   /* Free the cues. */
@@ -2805,8 +2805,8 @@
     free(this->indexes[i].timecode);
   }
   free(this->indexes);
-    
-  /* Free the top_level elem list */    
+
+  /* Free the top_level elem list */
   free(this->top_level_list);
 
   free(this->title);
@@ -2851,7 +2851,7 @@
       if ((channel >= 0) && (channel < this->num_sub_tracks)) {
         for (track_num = 0; track_num < this->num_tracks; track_num++) {
           matroska_track_t *track = this->tracks[track_num];
-          
+
           if ((track->buf_type & 0xFF00001F) == (BUF_SPU_BASE + channel)) {
             if (track->language) {
               strncpy (str, track->language, XINE_LANG_MAX);
@@ -2867,13 +2867,13 @@
         }
       }
       return DEMUX_OPTIONAL_UNSUPPORTED;
-      
+
     case DEMUX_OPTIONAL_DATA_AUDIOLANG:
       lprintf ("DEMUX_OPTIONAL_DATA_AUDIOLANG channel = %d\n",channel);
       if ((channel >= 0) && (channel < this->num_audio_tracks)) {
         for (track_num = 0; track_num < this->num_tracks; track_num++) {
           matroska_track_t *track = this->tracks[track_num];
-          
+
           if ((track->buf_type & 0xFF00001F) == (BUF_AUDIO_BASE + channel)) {
             if (track->language) {
               strncpy (str, track->language, XINE_LANG_MAX);

diff --git a/src/demuxers/demux_matroska.h b/src/demuxers/demux_matroska.h
--- a/src/demuxers/demux_matroska.h
+++ b/src/demuxers/demux_matroska.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -55,7 +55,7 @@
   off_t               *pos;
   uint64_t            *timecode;
   int                  num_entries;
-  
+
 } matroska_index_t;
 
 typedef struct {
@@ -110,10 +110,10 @@
   matroska_track_t    *audio_track;   /* to remove */
   matroska_track_t    *sub_track;     /* to remove */
   uint64_t             last_timecode;
-  
+
   int                  send_newpts;
   int                  buf_flag_seek;
-  
+
   /* seekhead parsing */
   int                  top_level_list_size;
   int                  top_level_list_max_size;
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -181,7 +181,7 @@
     buf->decoder_flags = BUF_FLAG_FRAMERATE;
     buf->decoder_info[0] = 90 * this->timer_count;
     if( this->input->get_length (this->input) )
-      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+      buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
     buf->extra_info->input_time = this->tick_count;
     buf->pts = 90 * this->tick_count;
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -71,16 +71,16 @@
   char                *artist;
   char                *copyright;
   size_t               filesize;
-  
+
   char                *buffer;
 
   int64_t              current_pts;
-  
+
   ModPlug_Settings     settings;
   ModPlugFile         *mpfile;
   int                  mod_length;
   int                  seek_flag;  /* this is set when a seek just occurred */
-  
+
 } demux_mod_t;
 
 typedef struct {
@@ -128,7 +128,7 @@
 static int open_mod_file(demux_mod_t *this) {
   int total_read;
   off_t input_length;
-  
+
   /* Get size and create buffer */
   input_length = this->input->get_length(this->input);
   /* Avoid potential issues with signed variables and e.g. read() returning -1 */
@@ -136,7 +136,7 @@
     xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - size overflow\n");
     return 0;
   }
-  this->filesize = input_length; 
+  this->filesize = input_length;
   this->buffer = (char *)malloc(this->filesize);
   if(!this->buffer) {
     xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - allocation failure\n");
@@ -145,23 +145,23 @@
 
   /* Seek to beginning */
   this->input->seek(this->input, 0, SEEK_SET);
-  
+
   /* Read data */
   total_read = this->input->read(this->input, this->buffer, this->filesize);
-  
+
   if(total_read != this->filesize) {
     xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - filesize error\n");
     free(this->buffer);
     return 0;
   }
-      
+
   this->mpfile = ModPlug_Load(this->buffer, this->filesize);
   if (this->mpfile==NULL) {
     xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - load error\n");
     free(this->buffer);
     return 0;
   }
-  
+
   /* Set up modplug engine */
   ModPlug_GetSettings(&this->settings);
   this->settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */
@@ -169,15 +169,15 @@
   this->settings.mBits = MOD_BITS;
   this->settings.mFrequency = MOD_SAMPLERATE;
   ModPlug_SetSettings(&this->settings);
-  
+
   this->title = strdup(ModPlug_GetName(this->mpfile));
   this->artist = strdup("");
   this->copyright = strdup("");
-  
+
   this->mod_length = ModPlug_GetLength(this->mpfile);
   if (this->mod_length < 1)
     this->mod_length = 1; /* avoids -ve & div-by-0 */
-    
+
   return 1;
 }
 
@@ -198,20 +198,20 @@
     buf->size = mlen;
     buf->pts = this->current_pts;
     buf->extra_info->input_time = buf->pts / 90;
-    
+
     buf->extra_info->input_normpos = buf->extra_info->input_time * 65535 / this->mod_length;
     buf->decoder_flags = BUF_FLAG_FRAME_END;
-    
+
     if (this->seek_flag) {
       _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK);
       this->seek_flag = 0;
     }
 
     this->audio_fifo->put (this->audio_fifo, buf);
-    
+
     this->current_pts += 90000 * mlen / OUT_BYTES_PER_SECOND;
   }
-  
+
   return this->status;
 }
 
@@ -257,9 +257,9 @@
 
   demux_mod_t *this = (demux_mod_t *) this_gen;
   int64_t seek_millis;
-  
+
   if (start_pos) {
-    seek_millis = this->mod_length; 
+    seek_millis = this->mod_length;
     seek_millis *= start_pos;
     seek_millis /= 65535;
   } else {
@@ -269,14 +269,14 @@
   _x_demux_flush_engine(this->stream);
   ModPlug_Seek(this->mpfile, seek_millis);
   this->current_pts = seek_millis * 90;
-  
+
   this->seek_flag = 1;
   return this->status;
 }
 
 static void demux_mod_dispose (demux_plugin_t *this_gen) {
   demux_mod_t *this = (demux_mod_t *) this_gen;
-  
+
   ModPlug_Unload(this->mpfile);
   free(this->buffer);
   free(this->title);
@@ -332,7 +332,7 @@
   this->status = DEMUX_FINISHED;
 
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "TEST mod decode\n");
-  
+
   switch (stream->content_detection_method) {
 
   case METHOD_EXPLICIT:
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -24,7 +24,7 @@
  *   APE tag reading
  *   Seeking??
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -66,7 +66,7 @@
   unsigned int         frames;
   double               samplerate;
   unsigned int         length;
-  
+
   unsigned int         current_frame;
   unsigned int         next_frame_bits;
 } demux_mpc_t;
@@ -82,7 +82,7 @@
 static int open_mpc_file(demux_mpc_t *this) {
   unsigned int first_frame_size;
   unsigned int id3v2_size = 0;
-  
+
   /* Read the file header */
   if (_x_demux_read_header(this->input, this->header, HEADER_SIZE) != HEADER_SIZE)
       return 0;
@@ -91,39 +91,39 @@
   if (INPUT_IS_SEEKABLE(this->input)) {
     /* Check for id3v2 tag */
     if (id3v2_istag(this->header)) {
-      
+
       lprintf("found id3v2 header\n");
-  
+
       /* Read tag size */
-      
+
       id3v2_size = _X_BE_32_synchsafe(&this->header[6]) + 10;
-     
+
       /* Add footer size if one is present */
       if (this->header[5] & 0x10)
         id3v2_size += 10;
-        
+
       lprintf("id3v2 size: %u\n", id3v2_size);
-        
+
       /* Seek past tag */
       if (this->input->seek(this->input, id3v2_size, SEEK_SET) < 0)
         return 0;
-        
+
       /* Read musepack header */
       if (this->input->read(this->input, this->header, HEADER_SIZE) != HEADER_SIZE)
         return 0;
     }
   }
-  
+
   /* Validate signature - We only support SV 7.x at the moment */
   if ( memcmp(this->header, "MP+", 3) != 0 ||
       ((this->header[3]&0x0f) != 0x07))
     return 0;
-    
+
   /* Get frame count */
   this->current_frame = 0;
   this->frames = _X_LE_32(&this->header[4]);
   lprintf("number of frames: %u\n", this->frames);
-  
+
   /* Get sample rate */
   switch ((_X_LE_32(&this->header[8]) >> 16) & 0x3) {
     case 0:
@@ -142,7 +142,7 @@
       break;
   }
   lprintf("samplerate: %f kHz\n", this->samplerate);
-  
+
   /* Calculate stream length */
   this->length = (int) ((double) this->frames * 1152 / this->samplerate);
   lprintf("stream length: %d ms\n", this->length);
@@ -151,14 +151,14 @@
   first_frame_size = (_X_LE_32(&this->header[24]) >> 4) & 0xFFFFF;
   this->next_frame_bits =  first_frame_size - 4;
   lprintf("first frame size: %u\n", first_frame_size);
-  
+
   /* Move input to start of data (to nearest multiple of 4) */
   this->input->seek(this->input, 28+id3v2_size, SEEK_SET);
-  
+
   /* Set stream info */
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, _X_ME_32(this->header));
-  
+
   return 1;
 }
 
@@ -168,30 +168,30 @@
   off_t bytes_read;
 
   buf_element_t *buf = NULL;
-  
+
   /* Check if we've finished */
   if (this->current_frame++ == this->frames) {
     lprintf("all frames read\n");
     this->status = DEMUX_FINISHED;
-    return this->status;    
+    return this->status;
   }
   lprintf("current frame: %u\n", this->current_frame);
-  
-  /* Get a buffer */  
+
+  /* Get a buffer */
   buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
   buf->type = BUF_AUDIO_MPC;
   buf->pts = 0;
   buf->extra_info->total_time = this->length;
-    
+
   /* Set normalised position */
-  buf->extra_info->input_normpos = 
-    (int) ((double) this->input->get_current_pos(this->input) * 65535 / 
+  buf->extra_info->input_normpos =
+    (int) ((double) this->input->get_current_pos(this->input) * 65535 /
            this->input->get_length(this->input));
-  
+
   /* Set time based on there being 1152 audio frames per frame */
-  buf->extra_info->input_time = 
+  buf->extra_info->input_time =
     (int) ((double) this->current_frame * 1152 / this->samplerate);
-    
+
   /* Calculate the number of bits that need to be read to finish reading
    * the current frame and read the size of the next frame. This number
    * has to be rounded up to the nearest 4 bytes on account of the
@@ -204,35 +204,35 @@
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             _("demux_mpc: frame too big for buffer"));
     this->status = DEMUX_FINISHED;
-    return this->status;    
+    return this->status;
   }
-  
+
   /* Read data */
   bytes_read = this->input->read(this->input, buf->content, bytes_to_read);
   if(bytes_read <= 0) {
     buf->free_buffer(buf);
     this->status = DEMUX_FINISHED;
     return this->status;
-  } else 
+  } else
     buf->size = bytes_read;
-  
+
   /* Read the size of the next frame */
   if (this->current_frame < this->frames) {
-    /* The number of bits of the next frame we've read */ 
+    /* The number of bits of the next frame we've read */
     extra_bits_read = bits_to_read - (this->next_frame_bits+20);
-  
+
     if(extra_bits_read <= 12)
       next_frame_size = (_X_LE_32(&buf->content[bytes_to_read-4]) >> extra_bits_read) & 0xFFFFF;
     else
       next_frame_size = ((_X_LE_32(&buf->content[bytes_to_read-8]) << (32-extra_bits_read)) |
                         (_X_LE_32(&buf->content[bytes_to_read-4]) >> extra_bits_read)) & 0xFFFFF;
-      
+
     lprintf("next frame size: %u\n", next_frame_size);
-    
+
     /* The number of bits of the next frame still to read */
-    this->next_frame_bits = next_frame_size - extra_bits_read;     
+    this->next_frame_bits = next_frame_size - extra_bits_read;
   }
-  
+
   /* Each buffer contains at least one frame */
   buf->decoder_flags |= BUF_FLAG_FRAME_END;
 
@@ -255,14 +255,14 @@
   /* Send header to decoder */
   if (this->audio_fifo) {
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
-    
+
     buf->type            = BUF_AUDIO_MPC;
     buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_FRAME_END;
     buf->decoder_info[0] = this->input->get_length(this->input);
     buf->decoder_info[1] = 0;
     buf->decoder_info[2] = 0;
     buf->decoder_info[3] = 0;
-    
+
     /* Copy the header */
     buf->size = HEADER_SIZE;
     memcpy(buf->content, this->header, buf->size);
@@ -333,12 +333,12 @@
   case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
-    
+
     if (!open_mpc_file(this)) {
       free (this);
       return NULL;
     }
-  
+
   break;
 
   default:
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -170,7 +170,7 @@
     } else
       atom_size -= ATOM_PREAMBLE_SIZE;
 
-    
+
     input->seek(input, atom_size, SEEK_CUR);
   }
 }
@@ -310,13 +310,13 @@
       buf->type      = BUF_SPU_SVCD + spu_id;
       buf->pts       = pts;
 
-      /* There is a bug in WinSubMux doesn't redo PACK headers in 
+      /* There is a bug in WinSubMux doesn't redo PACK headers in
 	 the private stream 1. This might cause the below to mess up.
       if( !preview_mode )
         check_newpts( this, this->pts, PTS_VIDEO );
       */
       this->video_fifo->put (this->video_fifo, buf);
-      lprintf ("SPU SVCD PACK (pts: %"PRId64", spu id: %d) put on FIFO\n", 
+      lprintf ("SPU SVCD PACK (pts: %"PRId64", spu id: %d) put on FIFO\n",
 	       buf->pts, spu_id);
 
       return;
@@ -368,10 +368,10 @@
             buf->decoder_flags = BUF_FLAG_PREVIEW;
 
           if( this->input->get_length (this->input) )
-            buf->extra_info->input_normpos = 
-	      (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+            buf->extra_info->input_normpos =
+	      (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		      65535) / this->input->get_length (this->input) );
-          
+
           if (this->rate)
             buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
                                                   * 1000 / (this->rate * 50));
@@ -405,8 +405,8 @@
         buf->decoder_flags |= BUF_FLAG_PREVIEW;
 
       if( this->input->get_length (this->input) )
-        buf->extra_info->input_normpos = 
-	  (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+        buf->extra_info->input_normpos =
+	  (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		  65535) / this->input->get_length (this->input) );
       if (this->rate)
         buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
@@ -449,7 +449,7 @@
 
     this->input->read (this->input, this->dummy_space, header_len);
 
-    for (i = len; i > 0; i -= (this->audio_fifo) 
+    for (i = len; i > 0; i -= (this->audio_fifo)
 	   ? this->audio_fifo->buffer_pool_buf_size : this->video_fifo->buffer_pool_buf_size) {
       if(this->audio_fifo) {
 	buf = this->input->read_block (this->input, this->audio_fifo,
@@ -469,8 +469,8 @@
 	  buf->decoder_flags = BUF_FLAG_PREVIEW;
 
         if( this->input->get_length (this->input) )
-          buf->extra_info->input_normpos = 
-	    (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+          buf->extra_info->input_normpos =
+	    (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		    65535) / this->input->get_length (this->input) );
         if (this->rate)
           buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
@@ -505,18 +505,18 @@
 
       header_len -= 5 ;
     }
-    
+
     if ((flags & 0x40) == 0x40) {
-    
+
       w = read_bytes(this, 1);
       dts = (int64_t)(w & 0x0e) << 29 ;
       w = read_bytes(this, 2);
       dts |= (w & 0xFFFE) << 14;
       w = read_bytes(this, 2);
       dts |= (w & 0xFFFE) >> 1;
-      
+
       header_len -= 5 ;
-    } 
+    }
 
     /* read rest of header */
     this->input->read (this->input, this->dummy_space, header_len);
@@ -542,8 +542,8 @@
 	buf->decoder_flags = BUF_FLAG_PREVIEW;
 
       if( this->input->get_length (this->input) )
-        buf->extra_info->input_normpos = 
-	  (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+        buf->extra_info->input_normpos =
+	  (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		  65535) / this->input->get_length (this->input) );
       if (this->rate)
         buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
@@ -554,7 +554,7 @@
 
   } else {
 
-    for (i = len; i > 0; i -= 10000) 
+    for (i = len; i > 0; i -= 10000)
       this->input->read (this->input, this->dummy_space, (i > 10000) ? 10000 : i);
   }
 
@@ -622,7 +622,7 @@
       pts |= (w & 0xFFFE) << 14;
 
       w = read_bytes(this, 2); len -= 2;
-      
+
       pts |= (w & 0xFFFE) >> 1;
 
       w = read_bytes(this, 1); len -= 1;
@@ -649,11 +649,11 @@
     lprintf("use scr\n");
     pts = scr;
[... 16 lines omitted ...]
-	    (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+          buf->extra_info->input_normpos =
+	    (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		    65535) / this->input->get_length (this->input) );
         if (this->rate)
           buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
@@ -708,8 +708,8 @@
 	buf->decoder_flags = BUF_FLAG_PREVIEW;
 
       if( this->input->get_length (this->input) )
-        buf->extra_info->input_normpos = 
-	  (int)( ((int64_t)this->input->get_current_pos (this->input) * 
+        buf->extra_info->input_normpos =
+	  (int)( ((int64_t)this->input->get_current_pos (this->input) *
 		  65535) / this->input->get_length (this->input) );
       if (this->rate)
         buf->extra_info->input_time = (int)((int64_t)this->input->get_current_pos (this->input)
@@ -720,12 +720,12 @@
 
   } else if (stream_id == 0xbd) {
 
-    for (i = len; i > 0; i -= 10000) 
+    for (i = len; i > 0; i -= 10000)
       this->input->read (this->input, this->dummy_space, (i > 10000) ? 10000 : i);
 
   } else {
 
-    for (i = len; i > 0; i -= 10000) 
+    for (i = len; i > 0; i -= 10000)
       this->input->read (this->input, this->dummy_space, (i > 10000) ? 10000 : i);
   }
 }
@@ -978,40 +978,40 @@
   demux_mpeg_t *this = (demux_mpeg_t *) this_gen;
   uint32_t w;
   int num_buffers = NUM_PREVIEW_BUFFERS;
-    
+
   this->video_fifo  = this->stream->video_fifo;
   this->audio_fifo  = this->stream->audio_fifo;
 
   this->rate          = 0; /* fixme */
   this->last_pts[0]   = 0;
   this->last_pts[1]   = 0;
-  
+
   _x_demux_control_start(this->stream);
 
   /*
    * send preview buffers for stream/meta_info
    */
-  
+
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
 
   this->preview_mode = 1;
-    
+
   this->input->seek (this->input, 4, SEEK_SET);
-    
+
   this->status = DEMUX_OK ;
-    
+
   do {
 
     w = parse_pack_preview (this, &num_buffers);
-      
+
     if (w != 0x000001ba)
       demux_mpeg_resync (this, w);
-      
+
     num_buffers --;
-      
+
   } while ( (this->status == DEMUX_OK) && (num_buffers > 0));
-    
+
   this->status = DEMUX_OK ;
 
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8);
@@ -1150,7 +1150,7 @@
       /* go through the same MPEG detection song and dance */
       if (input->read(input, buf, 4) == 4) {
 
-        if (!buf[0] && !buf[1] && (buf[2] == 0x01) 
+        if (!buf[0] && !buf[1] && (buf[2] == 0x01)
 	    && (buf[3] == 0xba)) /* if so, take it */
 	  break;
       }
@@ -1158,7 +1158,7 @@
       free (this);
       return NULL;
     }
-    
+
     /* reset position for next check */
     if (input->seek(input, 0, SEEK_SET) != 0) {
       free (this);
@@ -1169,7 +1169,7 @@
     fourcc_tag = _X_BE_32(&buf[0]);
     if (fourcc_tag == RIFF_TAG) {
       uint8_t large_buf[1024];
-      
+
       if (input->read(input, large_buf, 12) != 12) {
         free(this);
         return NULL;
@@ -1188,7 +1188,7 @@
        * MPEG video marker. No, it's not a very efficient approach, but
        * if execution has reached this special case, this is currently
        * the best chance for detecting the file automatically. Also,
-       * be extra lazy and do not bother skipping over the data 
+       * be extra lazy and do not bother skipping over the data
        * header. */
       for (i = 0; i < RIFF_CHECK_KILOBYTES && !ok; i++) {
 	if (input->read(input, large_buf, 1024) != 1024)
@@ -1244,7 +1244,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "mpeg", XINE_VERSION_CODE, &demux_info_mpeg, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -20,7 +20,7 @@
  * demultiplexer for mpeg 1/2 program streams
  * used with fixed blocksize devices (like dvd/vcd)
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +50,7 @@
 #define NUM_PREVIEW_BUFFERS   250
 #define DISC_TRESHOLD       90000
 
-#define WRAP_THRESHOLD     120000 
+#define WRAP_THRESHOLD     120000
 #define PTS_AUDIO 0
 #define PTS_VIDEO 1
 
@@ -62,14 +62,14 @@
 typedef struct demux_mpeg_block_s {
   demux_plugin_t        demux_plugin;
 
-  xine_stream_t        *stream;  
+  xine_stream_t        *stream;
   fifo_buffer_t        *audio_fifo;
   fifo_buffer_t        *video_fifo;
 
   input_plugin_t       *input;
 
   int                   status;
-  
+
   int                   blocksize;
   int                   rate;
 
@@ -129,30 +129,30 @@
 
 /* OK, i think demux_mpeg_block discontinuity handling demands some
    explanation:
-   
+
    - The preferred discontinuity handling/detection for DVD is based on
    NAV packets information. Most of the time it will provide us very
    accurate and reliable information.
-   
+
    - Has been shown that sometimes a DVD discontinuity may happen before
    a new NAV packet arrives (seeking?). To avoid sending wrong PTS to
    decoders we _used_ to check for SCR discontinuities. Unfortunately
    some VCDs have very broken SCR values causing false triggering.
-   
+
    - To fix the above problem (also note that VCDs don't have NAV
    packets) we fallback to the same PTS-based wrap detection as used
    in demux_mpeg. The only trick is to not send discontinuity information
    if NAV packets have already done the job.
-   
+
    [Miguel 02-05-2002]
 */
 
 static void check_newpts( demux_mpeg_block_t *this, int64_t pts, int video )
 {
   int64_t diff;
-  
+
   diff = pts - this->last_pts[video];
-  
+
   if( pts && (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) {
 
     /* check if pts is outside nav pts range. any stream without nav must enter here. */
@@ -170,10 +170,10 @@
     } else {
       lprintf("no wrap detected\n" );
     }
-    
+
     this->last_pts[1-video] = 0;
   }
-  
+
   if( pts )
     this->last_pts[video] = pts;
 }
@@ -226,9 +226,9 @@
     buf->decoder_flags = BUF_FLAG_PREVIEW;
   else
     buf->decoder_flags = 0;
-    
+
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
 
   while(p < (buf->content + this->blocksize)) {
@@ -441,7 +441,7 @@
     return 12;
 
   } else { /* mpeg2 */
-      
[... 370 lines omitted ...]
-  
+
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
-    
+
     int num_buffers = NUM_PREVIEW_BUFFERS;
-    
+
     this->input->seek (this->input, 0, SEEK_SET);
-    
+
     this->status = DEMUX_OK ;
     while ( (num_buffers>0) && (this->status == DEMUX_OK) ) {
-      
+
       demux_mpeg_block_parse_pack(this, 1);
       num_buffers --;
     }
-  } 
+  }
   /* else FIXME: implement preview generation from PREVIEW data */
 
   this->status = DEMUX_OK;
@@ -1271,19 +1271,19 @@
               this->input->get_length (this->input) );
 
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
-    
+
     if (start_pos) {
       start_pos /= (off_t) this->blocksize;
       start_pos *= (off_t) this->blocksize;
-      
+
       this->input->seek (this->input, start_pos, SEEK_SET);
     } else if (start_time) {
-      
+
       if( this->input->seek_time ) {
         this->input->seek_time (this->input, start_time, SEEK_SET);
       } else {
         start_time /= 1000;
-  
+
         if (this->last_cell_time) {
           start_pos = start_time - (this->last_cell_time + this->last_begin_time)/1000;
           start_pos *= this->rate;
@@ -1296,20 +1296,20 @@
         }
         start_pos /= (off_t) this->blocksize;
         start_pos *= (off_t) this->blocksize;
-        
+
         this->input->seek (this->input, start_pos, SEEK_SET);
       }
     } else
       this->input->seek (this->input, 0, SEEK_SET);
   }
-  
+
   /*
    * now start demuxing
    */
   this->last_cell_time = 0;
   this->send_newpts = 1;
   if( !playing ) {
-    
+
     this->buf_flag_seek = 0;
     this->nav_last_end_pts = this->nav_last_start_pts = 0;
     this->status   = DEMUX_OK ;
@@ -1320,7 +1320,7 @@
     this->nav_last_end_pts = this->nav_last_start_pts = 0;
     _x_demux_flush_engine(this->stream);
   }
-  
+
   return this->status;
 }
 
@@ -1338,7 +1338,7 @@
 
     lprintf ("mrl %s is new\n", this->cur_mrl);
 
-  } 
+  }
   else {
     lprintf ("mrl %s is known, bitrate: %d\n",
 	     this->cur_mrl, this->rate * 50 * 8);
@@ -1352,7 +1352,7 @@
    * find input plugin
    */
 
-  if (this->rate) 
+  if (this->rate)
     return (int)((int64_t) 1000 * this->input->get_length (this->input) /
                  (this->rate * 50));
   else
@@ -1377,7 +1377,7 @@
   this         = calloc(1, sizeof(demux_mpeg_block_t));
   this->stream = stream;
   this->input  = input;
-  
+
   this->demux_plugin.send_headers      = demux_mpeg_block_send_headers;
   this->demux_plugin.send_chunk        = demux_mpeg_block_send_chunk;
   this->demux_plugin.seek              = demux_mpeg_block_seek;
@@ -1392,9 +1392,9 @@
 
   lprintf ("open_plugin:detection_method=%d\n",
 	   stream->content_detection_method);
- 
+
   switch (stream->content_detection_method) {
-    
+
   case METHOD_BY_CONTENT: {
 
     /* use demux_mpeg for non-block devices */
@@ -1504,7 +1504,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -24,7 +24,7 @@
  *   (c) 2003 James Courtier-Dutton James@...
  *   This code might also decode normal MPG files.
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -54,7 +54,7 @@
 #define NUM_PREVIEW_BUFFERS   250
 #define DISC_TRESHOLD       90000
 
-#define WRAP_THRESHOLD     270000 
+#define WRAP_THRESHOLD     270000
 #define PTS_AUDIO 0
 #define PTS_VIDEO 1
 
@@ -66,14 +66,14 @@
 typedef struct demux_mpeg_pes_s {
   demux_plugin_t        demux_plugin;
 
-  xine_stream_t        *stream;  
+  xine_stream_t        *stream;
   fifo_buffer_t        *audio_fifo;
   fifo_buffer_t        *video_fifo;
 
   input_plugin_t       *input;
 
   int                   status;
-  
+
   int                   rate;
 
   char                  cur_mrl[256];
@@ -96,7 +96,7 @@
   uint8_t               mpeg1:1;
   uint8_t               wait_for_program_stream_pack_header:1;
   uint8_t               mpeg12_h264_detected:2;
-  
+
   int                   last_begin_time;
   int64_t               last_cell_time;
   off_t                 last_cell_pos;
@@ -207,7 +207,7 @@
   /* no discontinuity detected */
   return 0;
 }
- 
+
 static void check_newpts( demux_mpeg_pes_t *this, int64_t pts, int video )
 {
   if( pts && (this->send_newpts || detect_pts_discontinuity(this, pts, video) ) ) {
@@ -231,7 +231,7 @@
     /* clear pts on the other track to avoid detecting the same discontinuity again */
     this->last_pts[1-video] = 0;
   }
-  
+
   if( pts )
     this->last_pts[video] = pts;
 }
@@ -263,7 +263,7 @@
   int32_t        result;
   off_t          i;
   uint8_t        buf6[ 6 ];
-  
+
   this->scr = 0;
   this->preview_mode = preview_mode;
 
@@ -285,9 +285,9 @@
       return;
     }
   }
-  
+
   /* FIXME: buf must be allocated from somewhere before calling here. */
-  
+
   /* these streams should be allocated on the audio_fifo, if available. */
   if ((0xC0 <= p[ 3 ] && p[ 3 ] <= 0xDF) /* audio_stream */
       || 0xBD == p[ 3 ])                 /* private_sream_1 */
@@ -306,19 +306,19 @@
       return;
     }
   }
-  
+
   p = buf->mem;
 
   /* copy local buffer to fifo element. */
   memcpy(p, buf6, sizeof(buf6));
-  
+
   if (preview_mode)
     buf->decoder_flags = BUF_FLAG_PREVIEW;
   else
     buf->decoder_flags = 0;
-  
+
   if( this->input->get_length (this->input) )
[... 519 lines omitted ...]
   /* Set to Use rate given in by stream initially. */
-  this->rate = 0; 
+  this->rate = 0;
 #endif
-  
+
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
-    
+
     int num_buffers = NUM_PREVIEW_BUFFERS;
-    
+
     this->input->seek (this->input, 0, SEEK_SET);
-    
+
     this->status = DEMUX_OK ;
     while ( (num_buffers>0) && (this->status == DEMUX_OK) ) {
-      
+
       demux_mpeg_pes_parse_pack(this, 1);
       num_buffers --;
     }
-  } 
+  }
   else if((this->input->get_capabilities(this->input) & INPUT_CAP_PREVIEW) != 0) {
-    
+
     this->preview_size = this->input->get_optional_data(this->input, &this->preview_data, INPUT_OPTIONAL_DATA_PREVIEW);
     this->preview_done = 0;
 
@@ -1517,14 +1517,14 @@
               this->input->get_length (this->input) );
 
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
-    
+
     if (start_pos) {
       start_pos /= (off_t) 2048;
       start_pos *= (off_t) 2048;
-      
+
       this->input->seek (this->input, start_pos, SEEK_SET);
     } else if (start_time) {
-      
+
       if (this->last_cell_time) {
         start_pos = start_time - (this->last_cell_time + this->last_begin_time)/1000;
         start_pos *= this->rate;
@@ -1537,19 +1537,19 @@
       }
       start_pos /= (off_t) 2048;
       start_pos *= (off_t) 2048;
-      
+
       this->input->seek (this->input, start_pos, SEEK_SET);
     } else
       this->input->seek (this->input, 0, SEEK_SET);
   }
-  
+
   /*
    * now start demuxing
    */
   this->last_cell_time = 0;
   this->send_newpts = 1;
   if( !playing ) {
-    
+
     this->buf_flag_seek = 0;
     this->nav_last_end_pts = this->nav_last_start_pts = 0;
     this->status   = DEMUX_OK ;
@@ -1562,7 +1562,7 @@
     this->mpeg12_h264_detected = 0;
     _x_demux_flush_engine(this->stream);
   }
-  
+
   return this->status;
 }
 
@@ -1580,7 +1580,7 @@
 
     lprintf ("mrl %s is new\n", this->cur_mrl);
 
-  } 
+  }
   else {
     lprintf ("mrl %s is known, bitrate: %d\n",
              this->cur_mrl, this->rate * 50 * 8);
@@ -1594,7 +1594,7 @@
    * find input plugin
    */
 
-  if (this->rate) 
+  if (this->rate)
     return (int)((int64_t) 1000 * this->input->get_length (this->input) /
                  (this->rate * 50));
   else
@@ -1619,7 +1619,7 @@
   this         = calloc(1, sizeof(demux_mpeg_pes_t));
   this->stream = stream;
   this->input  = input;
-  
+
   this->demux_plugin.send_headers      = demux_mpeg_pes_send_headers;
   this->demux_plugin.send_chunk        = demux_mpeg_pes_send_chunk;
   this->demux_plugin.seek              = demux_mpeg_pes_seek;
@@ -1642,9 +1642,9 @@
 
   lprintf ("open_plugin:detection_method=%d\n",
 	   stream->content_detection_method);
- 
+
   switch (stream->content_detection_method) {
-    
+
   case METHOD_BY_CONTENT: {
 
     /* use demux_mpeg_block for block devices */
@@ -1771,7 +1771,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "mpeg_pes", XINE_VERSION_CODE, &demux_info_mpeg_pes, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2007 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -98,7 +98,7 @@
   uint32_t             stream_size;
   uint8_t              toc[XING_TOC_LENGTH];
   uint32_t             vbr_scale;
-  
+
   /* Lame extension */
   uint16_t             start_delay;
   uint16_t             end_delay;
@@ -289,7 +289,7 @@
     return 0;
   }
 #endif
-  
+
   {
     const uint16_t samples = mp3_samples[frame->version_idx][frame->layer - 1];
     frame->bitrate = mp3_bitrates[frame->version_idx][frame->layer - 1][frame_header.bitrate_idx] * 1000;
@@ -339,21 +339,21 @@
     else
       ptr += (9 + 4);
   }
-  
+
   if (ptr >= (buf + bufsize - 4)) goto exit_error;
   lprintf("checking %08X\n", *ptr);
-  
+
   if (_X_BE_32(ptr) == XING_TAG) {
     int has_frames_flag = 0;
     int has_bytes_flag = 0;
-  
+
     xing = calloc(1, sizeof(xing_header_t));
     if (!xing)
       goto exit_error;
-  
+
     lprintf("found Xing header\n");
     ptr += 4;
-    
+
     if (ptr >= (buf + bufsize - 4)) goto exit_error;
     xing->flags = _X_BE_32(ptr); ptr += 4;
 
@@ -369,7 +369,7 @@
       lprintf("stream size: %d\n", xing->stream_size);
       has_bytes_flag = 1;
     }
-  
+
     /* check if it's a useful Xing header */
     if (!has_frames_flag || !has_bytes_flag) {
       lprintf("Stupid Xing tag, cannot do anything with it !\n");
@@ -427,7 +427,7 @@
     lprintf("Xing header not found\n");
   }
   return xing;
-  
+
 exit_error:
   lprintf("Xing header parse error\n");
     free(xing);
@@ -450,13 +450,13 @@
     return NULL;
 
   ptr += (32 + 4);
-  
+
   if ((ptr + 4) >= (buf + bufsize)) return 0;
   lprintf("Checking %08X\n", *ptr);
   if (_X_BE_32(ptr) == VBRI_TAG) {
     lprintf("found Vbri header\n");
     ptr += 4;
-    
+
     if ((ptr + 22) >= (buf + bufsize)) return 0;
     vbri->version           = _X_BE_16(ptr); ptr += 2;
     vbri->delai             = _X_BE_16(ptr); ptr += 2;
@@ -699,7 +699,7 @@
 static int read_frame_header(demux_mpgaudio_t *this, uint8_t *header_buf, int bytes) {
   off_t len;
   int i;
-  
+
   for (i = 0; i < (4 - bytes); i++) {
     header_buf[i] = header_buf[i + bytes];
   }
@@ -955,7 +955,7 @@
         this->br = ((uint64_t)vbri->stream_size * 8 * 1000) / this->stream_length;
       }
     }
- 
+
     /* Set to default if Vbr header is incomplete or not present */
     if (!this->br) {
       /* assume CBR */
@@ -1144,7 +1144,7 @@
 static int demux_mpgaudio_get_optional_data(demux_plugin_t *this_gen,
 					void *data, int data_type) {
   return DEMUX_OPTIONAL_UNSUPPORTED;
-} 
+}
 
 static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream,
                                     input_plugin_t *input) {
@@ -1166,7 +1166,7 @@
   case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
-  
+
   default:
     return NULL;
   }
@@ -1200,9 +1200,9 @@
  * demux mpegaudio class
  */
 void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
-  
+
   demux_mpgaudio_class_t     *this;
-  
+
   this         = calloc(1, sizeof(demux_mpgaudio_class_t));
   this->xine   = xine;
 
@@ -1210,7 +1210,7 @@
   this->demux_class.description     = N_("MPEG audio demux plugin");
   this->demux_class.identifier      = "MPEGAUDIO";
   if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) {
-    this->demux_class.mimetypes = 
+    this->demux_class.mimetypes =
       "audio/mpeg2: mp2: MPEG audio;"
       "audio/x-mpeg2: mp2: MPEG audio;"
       "audio/mpeg3: mp3: MPEG audio;"
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -106,17 +106,17 @@
       /* 29.97 fps */
       this->frame_pts_inc = 3003;
       break;
-      
+
     case 3:
       /* 23.976 fps */
       this->frame_pts_inc = 3753;
       break;
-      
+
     case 5:
       /* 14.98 fps */
       this->frame_pts_inc = 6006;
       break;
-      
+
     default:
       lprintf("unknown framerate: 0x%02X\n", this->fps);
       this->frame_pts_inc = 90000;
@@ -124,7 +124,7 @@
     }
   } else
     this->frame_pts_inc = 90000 / this->fps;
-  
+
   lprintf("frame_pts_inc=%d\n", this->frame_pts_inc);
 }
 
@@ -138,7 +138,7 @@
 
     int ultravox_rest;
     int buffer_pos = 0;
-    
+
     /* ultravox stuff */
     while (len) {
       ultravox_rest = this->ultravox_size - this->ultravox_pos;
@@ -194,7 +194,7 @@
     /* ultravox stuff */
     if (origin == SEEK_CUR) {
       uint8_t buffer[1024];
-      
+
       while (offset) {
 	if (offset > sizeof(buffer)) {
 	  if (nsv_read(this, buffer, sizeof(buffer)) != sizeof(buffer))
@@ -221,7 +221,7 @@
 
   for (i = 0; i < NSV_MAX_RESYNC; i++) {
     uint8_t byte;
-    
+
     if (nsv_read(this, &byte, 1) != 1)
       return NSV_RESYNC_ERROR;
 
@@ -267,11 +267,11 @@
 
   while (!NSVs_found) {
     switch (nsv_resync(this)) {
-      
+
     case NSV_RESYNC_NSVf:
       {
 	uint32_t chunk_size;
-	
+
 	/* if there is a NSVs tag, load 24 more header bytes; load starting at
 	 * offset 4 in buffer to keep header data in line with document */
 	if (nsv_read(this, &preview[4], 24) != 24)
@@ -280,20 +280,20 @@
 	lprintf("found NSVf chunk\n");
 	/*	this->data_size = _X_LE_32(&preview[8]);*/
 	/*lprintf("data_size: %lld\n", this->data_size);*/
-	
+
 	/* skip the rest of the data */
 	chunk_size = _X_LE_32(&preview[4]);
 	nsv_seek(this, chunk_size - 28, SEEK_CUR);
       }
       break;
-    
+
     case NSV_RESYNC_NSVs:
-      
-      /* fetch the remaining 15 header bytes of the first chunk to get the 
+
+      /* fetch the remaining 15 header bytes of the first chunk to get the
        * relevant information */
       if (nsv_read(this, &preview[4], 15) != 15)
 	return 0;
-      
+
       this->video_fourcc = _X_ME_32(&preview[4]);
       if (_x_is_fourcc(&preview[4], "NONE"))
 	this->video_type = 0;
@@ -303,7 +303,7 @@
 	if (!this->video_type)
 	  _x_report_video_fourcc (this->stream->xine, LOG_MODULE, this->video_fourcc);
       }
-      
+
       this->audio_fourcc = _X_ME_32(&preview[8]);
       if (_x_is_fourcc(&preview[8], "NONE"))
 	this->audio_type = 0;
@@ -313,16 +313,16 @@
 	if (!this->audio_type)
 	  _x_report_audio_format_tag (this->stream->xine, LOG_MODULE, this->audio_fourcc);
       }
-      
+
       this->bih.biSize = sizeof(this->bih);
       this->bih.biWidth = _X_LE_16(&preview[12]);
       this->bih.biHeight = _X_LE_16(&preview[14]);
       this->bih.biCompression = this->video_fourcc;
       this->video_pts = 0;
-      
+
       /* may not be true, but set it for the time being */
       this->frame_pts_inc = 3003;
-      
+
       lprintf("video: %c%c%c%c, buffer type %08X, %dx%d\n",
 	      preview[4],
 	      preview[5],
@@ -341,10 +341,10 @@
       nsv_parse_framerate(this, preview[16]);
       NSVs_found = 1;
       break;
-    
+
     case NSV_RESYNC_ERROR:
       return 0;
-      
+
     }
   }
 
@@ -466,27 +466,27 @@
   current_file_pos = this->input->get_current_pos(this->input);
 
   lprintf("dispatching video & audio chunks...\n");
-  
+
   if (this->is_first_chunk) {
     chunk_type = NSV_RESYNC_BEEF;
     this->is_first_chunk = 0;
   } else {
     chunk_type = nsv_resync(this);
   }
-  
+
   switch (chunk_type) {
   case NSV_RESYNC_NSVf:
     /* do nothing */
     break;
-    
+
   case NSV_RESYNC_NSVs:
     /* skip header */
     if (nsv_read(this, buffer, 15) != 15)
       return 0;
     nsv_parse_framerate(this, buffer[12]);
-    
+
     /* fall thru */
-    
+
   case NSV_RESYNC_BEEF:
     if (nsv_read(this, buffer, 5) != 5) {
       this->status = DEMUX_FINISHED;
@@ -496,15 +496,15 @@
     video_size >>= 4;
     video_size &= 0xFFFFF;
     audio_size = _X_LE_16(&buffer[3]);
-    
+
     nsv_parse_payload(this, video_size, audio_size);
     break;
-    
+
   case NSV_RESYNC_ERROR:
     this->status = DEMUX_FINISHED;
     break;
   }
-  
+
   return this->status;
 }
 
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2007 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
@@ -22,7 +22,7 @@
  *        Claudio Ciccani (klan@...)
  *
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -60,13 +60,13 @@
 
 typedef struct {
   demux_plugin_t     demux_plugin;
-    
+
   xine_t            *xine;
   xine_stream_t     *stream;
   input_plugin_t    *input;
-  
+
   playlist_t         playlist;
-  
+
   int                status;
 } demux_playlist_t;
 
@@ -76,12 +76,12 @@
 
 
 static playlist_t detect_by_extension (input_plugin_t *input) {
-  char *ext; 
-  
+  char *ext;
+
   ext = strrchr (input->get_mrl (input), '.');
   if (!ext)
-    return XINE_PLT_NONE; 
-  
+    return XINE_PLT_NONE;
+
   if (!strcasecmp (ext, ".m3u"))
     return XINE_PLT_M3U;
   if (!strcasecmp (ext, ".ram"))
@@ -108,24 +108,24 @@
 static playlist_t detect_by_content (input_plugin_t *input) {
   char buf[256], *tmp;
   int  len;
-  
+
   len = _x_demux_read_header (input, buf, sizeof(buf)-1);
   if (len <= 0)
     return XINE_PLT_NONE;
   buf[len] = '\0';
-  
+
   tmp = buf;
   while (*tmp && isspace(*tmp))
     tmp++;
-  
+
   if (!strncmp (tmp, "[Reference]", 11) ||
       !strncmp (tmp, "Ref1=", 5))
     return XINE_PLT_REF;
   if (!strncmp (tmp, "#EXTM3U", 7))
     return XINE_PLT_M3U;
   if (!strncmp (tmp, "file://", 7) ||
-      !strncmp (tmp, "http://", 7) || 
-      !strncmp (tmp, "rtsp://", 7) || 
+      !strncmp (tmp, "http://", 7) ||
+      !strncmp (tmp, "rtsp://", 7) ||
       !strncmp (tmp, "pnm://", 6))
     return XINE_PLT_RAM;
   if (!strncmp (tmp, "[Playlist]", 10 ))
@@ -140,7 +140,7 @@
     return XINE_PLT_XSPF;
   if (!strncmp (tmp, "<rss", 4))
     return XINE_PLT_RSS;
-  
+
   if (!strncmp (tmp, "<?xml", 5)) {
     tmp += 5;
     while ((tmp = strchr (tmp, '<'))) {
@@ -157,27 +157,27 @@
       tmp++;
     }
   }
-  
+
   return XINE_PLT_NONE;
 }
 
 static char* trim (char *s) {
   char *e;
-  
+
   while (*s && isspace(*s))
     s++;
- 
+
   e = s + strlen(s) - 1;
   while (e > s && isspace(*e))
     *e-- = '\0';
[... 327 lines omitted ...]
+
     xml_parser_free_tree (root);
   }
 }
@@ -526,20 +526,20 @@
 
 static void demux_playlist_send_headers (demux_plugin_t *this_gen) {
   demux_playlist_t *this = (demux_playlist_t *) this_gen;
-  
+
   this->status = DEMUX_OK;
-  
+
   _x_demux_control_start (this->stream);
-  
+
   this->input->seek (this->input, 0, SEEK_SET);
 }
-  
+
 
 static int demux_playlist_send_chunk (demux_plugin_t *this_gen) {
   demux_playlist_t *this = (demux_playlist_t *) this_gen;
   char             *data = NULL;
   int               length;
-  
+
   length = this->input->get_length (this->input);
   if (length > 0) {
     data = xine_xmalloc (length+1);
@@ -549,21 +549,21 @@
   else {
     char buf[1024];
     int  len;
-    
+
     length = 0;
     while ((len = this->input->read (this->input, buf, sizeof(buf))) > 0) {
       data = realloc (data, length+len+1);
       if (!data)
         break;
-        
+
       memcpy (data+length, buf, len);
       length += len;
       data[length] = '\0';
     }
   }
-  
+
   lprintf ("data:%p length:%d\n", data, length);
-  
+
   if (data) {
     switch (this->playlist) {
       case XINE_PLT_REF:
@@ -597,12 +597,12 @@
         lprintf ("unexpected playlist type 0x%08x\n", this->playlist);
         break;
     }
-    
+
     free (data);
   }
 
   this->status = DEMUX_FINISHED;
-  
+
   return DEMUX_FINISHED;
 }
 
@@ -613,7 +613,7 @@
 
 static int demux_playlist_get_status (demux_plugin_t *this_gen) {
   demux_playlist_t *this = (demux_playlist_t *) this_gen;
-  
+
   return this->status;
 }
 
@@ -631,7 +631,7 @@
 }
 
 
-static demux_plugin_t *open_plugin (demux_class_t *class_gen, 
+static demux_plugin_t *open_plugin (demux_class_t *class_gen,
                                     xine_stream_t *stream, input_plugin_t *input) {
   demux_playlist_t *this;
 
@@ -649,7 +649,7 @@
   this->demux_plugin.get_capabilities  = demux_playlist_get_capabilities;
   this->demux_plugin.get_optional_data = demux_playlist_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
-  
+
   switch (stream->content_detection_method) {
     case METHOD_BY_MRL:
       lprintf ("detect by extension\n");
@@ -659,7 +659,7 @@
         return NULL;
       }
       break;
-   
+
     case METHOD_BY_CONTENT:
     case METHOD_EXPLICIT:
       lprintf ("detect by content\n");
@@ -674,9 +674,9 @@
       free (this);
       return NULL;
   }
-  
+
   lprintf ("playlist:0x%08x (%s)\n", this->playlist, (char*)&this->playlist);
-  
+
   return &this->demux_plugin;
 }
 
@@ -688,7 +688,7 @@
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Playlist demux plugin");
   this->demux_class.identifier      = "playlist";
-  this->demux_class.mimetypes       = 
+  this->demux_class.mimetypes       =
     "audio/mpegurl: m3u: M3U playlist;"
     "audio/x-mpegurl: m3u: M3U playlist;"
     //"audio/x-pn-realaudio: ram: RAM playlist;"

diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -148,7 +148,7 @@
   current_file_pos = this->input->get_current_pos(this->input);
 
   if (preamble[2] == 1) {
-    
+
     /* video */
 
     /* load the pts if it is the first thing in the chunk */
@@ -253,7 +253,7 @@
     buf->pts = pts;
 
     if( this->data_size )
-      buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) * 
+      buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) *
                                               65535 / this->data_size);
 
     this->audio_fifo->put (this->audio_fifo, buf);
@@ -302,7 +302,7 @@
 
   buf->pts = 0;
   if( this->data_size )
-    buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) * 
+    buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) *
                                               65535 / this->data_size);
   buf->type = BUF_VIDEO_MPEG;
 
@@ -329,7 +329,7 @@
 
     buf->pts = 0;
     if( this->data_size )
-      buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) * 
+      buf->extra_info->input_normpos = (int) ((double) this->input->get_current_pos(this->input) *
                                               65535 / this->data_size);
     buf->type = BUF_AUDIO_MPEG;
 
@@ -347,7 +347,7 @@
   unsigned char seek_buffer[SEEK_BUFFER_SIZE];
   int found = 0;
   int i;
-  
+
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );

# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 3]

diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -266,10 +266,10 @@
 
   /* flags that indicate how a trak is supposed to be used */
   unsigned int flags;
-  
+
   /* formattag-like field that specifies codec in mp4 files */
   unsigned int object_type_id;
-  
+
   /* decoder data pass information to the decoder */
   void *decoder_config;
   int decoder_config_len;
@@ -311,7 +311,7 @@
   unsigned int modification_time;
   unsigned int timescale;  /* base clock frequency is Hz */
   unsigned int duration;
-        
+
   int64_t moov_first_offset;
 
   int               trak_count;
@@ -385,7 +385,7 @@
  * lazyqt special debugging functions
  **********************************************************************/
 
-/* define DEBUG_ATOM_LOAD as 1 to get a verbose parsing of the relevant 
+/* define DEBUG_ATOM_LOAD as 1 to get a verbose parsing of the relevant
  * atoms */
 #define DEBUG_ATOM_LOAD 0
 
@@ -411,7 +411,7 @@
 
 /* Define DEBUG_DUMP_MOOV as 1 to dump the raw moov atom to disk. This is
  * particularly useful in debugging a file with a compressed moov (cmov)
- * atom. The atom will be dumped to the filename specified as 
+ * atom. The atom will be dumped to the filename specified as
  * RAW_MOOV_FILENAME. */
 #define DEBUG_DUMP_MOOV 0
 #define RAW_MOOV_FILENAME "moovatom.raw"
@@ -512,7 +512,7 @@
     atom = _X_BE_32(&atom_preamble[4]);
 
     /* Special case alert: 'free' atoms sometimes masquerade as 'moov'
-     * atoms. If this is a free atom, check for 'cmov' or 'mvhd' immediately 
+     * atoms. If this is a free atom, check for 'cmov' or 'mvhd' immediately
      * following. QT Player can handle it, so xine should too. */
     if (atom == FREE_ATOM) {
 
@@ -543,7 +543,7 @@
 
     /* if this atom is not the moov atom, make sure that it is at least one
      * of the other top-level QT atom.
-     * However, allow a configurable amount ( currently 1 ) atom be a 
+     * However, allow a configurable amount ( currently 1 ) atom be a
      * non known atom, in hopes a known atom will be found */
     if ((atom != FREE_ATOM) &&
         (atom != JUNK_ATOM) &&
@@ -716,7 +716,7 @@
   } else {
     unsigned char atom_preamble[ATOM_PREAMBLE_SIZE];
     /* check that the next atom in the chunk contains alphanumeric
-     * characters in the atom type field; if not, disqualify the file 
+     * characters in the atom type field; if not, disqualify the file
      * as a QT file */
     qt_file->seek(qt_file, moov_atom_offset + ATOM_PREAMBLE_SIZE, SEEK_SET);
     if (qt_file->read(qt_file, atom_preamble, ATOM_PREAMBLE_SIZE) !=
@@ -732,7 +732,7 @@
 
 static char *parse_data_atom(const uint8_t *data_atom, uint32_t max_size) {
   uint32_t data_atom_size = _X_BE_32(&data_atom[0]);
-  
+
   static const int data_atom_max_version = 0;
   const int data_atom_version = data_atom[8];
 
@@ -785,7 +785,7 @@
     const qt_atom current_atom_code = _X_BE_32(&current_atom[4]);
     const uint32_t current_atom_size = _X_BE_32(&current_atom[0]);
     uint32_t handler_type = 0;
-    
+
     switch (current_atom_code) {
     case HDLR_ATOM: {
       static const int hdlr_atom_max_version = 0;
@@ -869,7 +869,7 @@
 static int mp4_read_descr_len(unsigned char *s, uint32_t *length) {
   uint8_t b;
   uint8_t numBytes = 0;
-  
+
   *length = 0;
 
   do {
@@ -935,14 +935,14 @@
       break;
     }
   }
-  
+
   debug_atom_load("  qt: parsing %s trak atom\n",
     (trak->type == MEDIA_VIDEO) ? "video" :
       (trak->type == MEDIA_AUDIO) ? "audio" : "other");
 
   /* search for the useful atoms */
   for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
-    const uint32_t current_atom_size = _X_BE_32(&trak_atom[i - 4]);	
+    const uint32_t current_atom_size = _X_BE_32(&trak_atom[i - 4]);
     const qt_atom current_atom = _X_BE_32(&trak_atom[i]);
 
     switch(current_atom) {
@@ -1014,7 +1014,7 @@
       properties_offset = 0x0C;
       for (k = 0; k < trak->stsd_atoms_count; k++) {
 
-        const uint32_t current_stsd_atom_size = _X_BE_32(&trak_atom[atom_pos - 4]);      
+        const uint32_t current_stsd_atom_size = _X_BE_32(&trak_atom[atom_pos - 4]);
         if (current_stsd_atom_size < 4) {
           last_error = QT_HEADER_TROUBLE;
           goto free_trak;
@@ -1037,7 +1037,7 @@
 
           /* copy the properties atom */
           trak->stsd_atoms[k].video.properties_atom_size = current_stsd_atom_size - 4;
-          trak->stsd_atoms[k].video.properties_atom = 
[... 357 lines omitted ...]
@@ -2612,7 +2612,7 @@
 
       /* Special case alert: If this is signed, 8-bit data, transform
        * the data to unsigned. */
-      if ((audio_trak->properties->audio.bits == 8) && 
+      if ((audio_trak->properties->audio.bits == 8) &&
           ((audio_trak->properties->audio.codec_fourcc == TWOS_FOURCC) ||
            (audio_trak->properties->audio.codec_fourcc == SOWT_FOURCC)))
         for (j = 0; j < buf->size; j++)
@@ -2681,7 +2681,7 @@
     this->bih.biBitCount = video_trak->properties->video.depth;
 
     this->bih.biCompression = video_trak->properties->video.codec_fourcc;
-    video_trak->properties->video.codec_buftype = 
+    video_trak->properties->video.codec_buftype =
       _x_fourcc_to_buf_video(this->bih.biCompression);
 
     /* hack: workaround a fourcc clash! 'mpg4' is used by MS and Sorenson
@@ -2689,8 +2689,8 @@
      */
     if( video_trak->properties->video.codec_buftype == BUF_VIDEO_MSMPEG4_V1 )
       video_trak->properties->video.codec_buftype = BUF_VIDEO_MPEG4;
-  
-    if( !video_trak->properties->video.codec_buftype && 
+
+    if( !video_trak->properties->video.codec_buftype &&
          video_trak->properties->video.codec_fourcc )
     {
       video_trak->properties->video.codec_buftype = BUF_VIDEO_UNKNOWN;
@@ -2699,7 +2699,7 @@
     }
 
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, 
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,
                          this->bih.biWidth);
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT,
                          this->bih.biHeight);
@@ -2732,7 +2732,7 @@
           break;
       }
     } else {
-      audio_trak->properties->audio.codec_buftype = 
+      audio_trak->properties->audio.codec_buftype =
         _x_formattag_to_buf_audio(audio_trak->properties->audio.codec_fourcc);
     }
 
@@ -2751,7 +2751,7 @@
       audio_trak->properties->audio.sample_rate);
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
       audio_trak->properties->audio.bits);
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, 
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC,
       audio_trak->properties->audio.codec_fourcc);
 
   } else {
@@ -2792,17 +2792,17 @@
       (video_trak->properties->video.codec_buftype)) {
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-    
+
     memcpy(buf->content, &this->bih, sizeof(this->bih));
     buf->size = sizeof(this->bih);
     buf->type = video_trak->properties->video.codec_buftype;
     this->video_fifo->put (this->video_fifo, buf);
-      
+
     /* send header info to decoder. some mpeg4 streams need this */
     if( video_trak->decoder_config ) {
       buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
       buf->type = video_trak->properties->video.codec_buftype;
-      
+
       if (video_trak->properties->video.codec_fourcc == AVC1_FOURCC) {
         buf->size = 0;
         buf->decoder_flags = BUF_FLAG_SPECIAL|BUF_FLAG_HEADER;
@@ -2846,9 +2846,9 @@
 
     /* set the audio bitrate field (only for CBR audio) */
     if (!audio_trak->properties->audio.vbr) {
-      audio_bitrate = 
+      audio_bitrate =
         audio_trak->properties->audio.sample_rate /
-        audio_trak->properties->audio.samples_per_frame * 
+        audio_trak->properties->audio.samples_per_frame *
         audio_trak->properties->audio.bytes_per_frame *
         audio_trak->properties->audio.channels *
         8;
@@ -2863,7 +2863,7 @@
     buf->decoder_info[1] = audio_trak->properties->audio.sample_rate;
     buf->decoder_info[2] = audio_trak->properties->audio.bits;
     buf->decoder_info[3] = audio_trak->properties->audio.channels;
-    
+
     if( audio_trak->properties->audio.wave_size ) {
       if( audio_trak->properties->audio.wave_size > buf->max_size )
         buf->size = buf->max_size;
@@ -2874,9 +2874,9 @@
       buf->size = 0;
       buf->content = NULL;
     }
-        
+
     this->audio_fifo->put (this->audio_fifo, buf);
-    
+
     if( audio_trak->decoder_config ) {
       buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
       buf->type = audio_trak->properties->audio.codec_buftype;
@@ -2969,7 +2969,7 @@
   qt_trak *video_trak = NULL;
   qt_trak *audio_trak = NULL;
   int64_t keyframe_pts;
-  
+
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );
 
@@ -3191,7 +3191,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "quicktime", XINE_VERSION_CODE, &demux_info_qt, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -89,17 +89,17 @@
   /* TODO: duplicate data and send to audio fifo.
    * however we don't have dvaudio decoder yet.
    */
-  
+
   buf->pts                    = this->pts;
   buf->extra_info->input_time = this->pts/90;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
   buf->extra_info->frame_number  = this->cur_frame;
   buf->type                   = BUF_VIDEO_DV;
-  
+
   this->video_fifo->put(this->video_fifo, buf);
-  
+
   if (this->audio_fifo) {
     abuf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
     abuf->content = abuf->mem;
@@ -213,11 +213,11 @@
   bih->biSizeImage = bih->biWidth*bih->biHeight;
 
   this->video_fifo->put(this->video_fifo, buf);
-  
+
   this->pts = 0;
   this->cur_frame = 0;
   this->bytes_left = this->frame_size;
- 
+
   this->status = DEMUX_OK;
 
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
@@ -305,18 +305,18 @@
     /* Upcast start_time in case sizeof(off_t) > sizeof(int) */
     start_pos = ((off_t) start_time * 90 / this->duration) * this->frame_size;
   }
-  
-  start_pos = start_pos - (start_pos % this->frame_size);  
+
+  start_pos = start_pos - (start_pos % this->frame_size);
   this->input->seek(this->input, start_pos, SEEK_SET);
 
   this->cur_frame = start_pos / this->frame_size;
   this->pts = this->cur_frame * this->duration;
   this->bytes_left = this->frame_size;
-  
+
   _x_demux_flush_engine (this->stream);
 
   _x_demux_control_newpts (this->stream, this->pts, BUF_FLAG_SEEK);
-  
+
   this->status = DEMUX_OK;
   return this->status;
 }
@@ -362,7 +362,7 @@
 
   case METHOD_BY_CONTENT: {
     uint8_t buf[8];
-    
+
     if (_x_demux_read_header(input, buf, 8) != 8) {
       free (this);
       return NULL;
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -26,9 +26,9 @@
  *
  * video packet sub-demuxer ported from mplayer code (www.mplayerhq.hu):
  *   Real parser & demuxer
- *   
+ *
  *   (C) Alex Beregszaszi <alex@...>
- *   
+ *
  *   Based on FFmpeg's libav/rm.c.
  */
 
@@ -111,10 +111,10 @@
   uint32_t             fourcc;
   uint32_t             buf_type;
   uint32_t             format;
-  
+
   real_index_entry_t  *index;
   int                  index_entries;
-  
+
   mdpr_t              *mdpr;
   int                  sps, cfs, w, h;
   int                  block_align;
@@ -159,7 +159,7 @@
   int64_t              last_pts[2];
   int                  send_newpts;
   int                  buf_flag_seek;
-  
+
   uint32_t             last_ts;
   uint32_t             next_ts;
   int                  last_seq;
@@ -184,7 +184,7 @@
   unsigned char        index_chunk_header[INDEX_CHUNK_HEADER_SIZE];
   unsigned char        index_record[INDEX_RECORD_SIZE];
   int                  i;
-  
+
   while(next_index_chunk) {
     lprintf("reading index chunk at %"PRIX64"\n", next_index_chunk);
 
@@ -242,7 +242,7 @@
     if(index && entries)
       /* Allocate memory for index */
       *index = calloc(entries, sizeof(real_index_entry_t));
-        
+
     if(index && entries && *index) {
       /* Read index */
       for(i = 0; i < entries; i++) {
@@ -351,7 +351,7 @@
   const uint16_t codec_data_length = _X_BE_16 (data+40);
   const uint16_t coded_frame_size2 = _X_BE_16 (data+42);
   const uint16_t subpacket_size    = _X_BE_16 (data+44);
-    
+
   stream->sps         = subpacket_size;
   stream->w           = coded_frame_size2;
   stream->h           = codec_data_length;
@@ -376,7 +376,7 @@
     break;
 
   default:
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "demux_real: error, i don't handle buf type 0x%08x\n", stream->buf_type);
   }
 
@@ -419,12 +419,12 @@
     uint8_t signature[REAL_SIGNATURE_SIZE];
     if (this->input->read(this->input, signature, REAL_SIGNATURE_SIZE) !=
 	REAL_SIGNATURE_SIZE) {
-      
+
       lprintf ("signature not read\n");
       this->status = DEMUX_FINISHED;
       return;
     }
-    
+
     if ( !_x_is_fourcc(signature, ".RMF") ) {
       this->status = DEMUX_FINISHED;
       lprintf ("signature not found '%.4s'\n", signature);
@@ -474,11 +474,11 @@
 	  this->status = DEMUX_FINISHED;
 	  return;
 	}
-      
+
 	uint16_t version = _X_BE_16(&chunk_buffer[0]);
 
 	if (chunk_type == PROP_TAG) {
-      
+
 	  if(version != 0) {
 	    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		    "demuxe_real: unknown object version in PROP: 0x%04x\n", version);
@@ -510,7 +510,7 @@
 	    free(chunk_buffer);
 	    continue;
 	  }
-                
+
 	  mdpr_t *const mdpr = real_parse_mdpr (chunk_buffer, chunk_size);
 
 	  lprintf ("parsing type specific data...\n");
@@ -535,7 +535,7 @@
 		      "demux_real: maximum number of audio stream exceeded\n");
 	      goto unknown;
 	    }
-          
+
 	    const uint16_t version = _X_BE_16(mdpr->type_specific_data + 4);
 
 	    lprintf("audio version %d detected\n", version);
@@ -543,7 +543,7 @@
 	    char *fourcc_ptr = "\0\0\0";
 	    switch(version) {
             case 3:
-              /* Version 3 header stores fourcc after meta info - cheat by reading backwards from the 
+              /* Version 3 header stores fourcc after meta info - cheat by reading backwards from the
                * end of the header instead of having to parse it all */
 	      if (mdpr->type_specific_len >= 5)
[... 552 lines omitted ...]
 	  if(pos + sps > fs || this->input->read(this->input, buffer + pos, sps) < sps) {
-	    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		    "demux_real: failed to read audio chunk\n");
-	    
+
 	    this->status = DEMUX_FINISHED;
-	    return this->status; 
+	    return this->status;
 	  }
 	}
 	break;
       case BUF_AUDIO_SIPRO:
 	pos = spc * w;
 	if(pos + w > fs || this->input->read(this->input, buffer + pos, w) < w) {
-	  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		  "demux_real: failed to read audio chunk\n");
-	    
+
 	  this->status = DEMUX_FINISHED;
-	  return this->status; 
+	  return this->status;
 	}
 	if (spc == sph - 1)
 	  demux_real_sipro_swap (buffer, sph * w * 2 / 96);
@@ -1481,20 +1481,20 @@
 			   this->duration, 0);
       }
     } else {
-      if(_x_demux_read_send_data(this->audio_fifo, this->input, size, pts, 
+      if(_x_demux_read_send_data(this->audio_fifo, this->input, size, pts,
            this->audio_stream->buf_type, 0, normpos,
            input_time, this->duration, 0) < 0) {
 
-        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
                 "demux_real: failed to read audio chunk\n");
 
         this->status = DEMUX_FINISHED;
         return this->status;
       }
-      
+
       /* FIXME: dp->flags = (flags & 0x2) ? 0x10 : 0; */
     }
-  
+
   } else {
 
     /* discard */
@@ -1577,14 +1577,14 @@
   demux_real_t       *this = (demux_real_t *) this_gen;
   real_index_entry_t *index, *other_index = NULL;
   int                 i = 0, entries;
-  
+
   lprintf("seek start_pos=%d, start_time=%d, playing=%d\n",
           (int)start_pos, start_time, playing);
 
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) &&
      ((this->audio_stream && this->audio_stream->index) ||
       (this->video_stream && this->video_stream->index))) {
-      
+
     start_pos = (off_t) ( (double) start_pos / 65535 *
                 this->input->get_length (this->input) );
 
@@ -1632,14 +1632,14 @@
     /* RTSP supports only time based seek */
     if (start_pos && !start_time)
       start_time = (int64_t) this->duration * start_pos / 65535;
-      
+
     this->input->seek_time(this->input, start_time, SEEK_SET);
   }
 
   this->send_newpts     = 1;
   this->old_seqnum      = -1;
   this->fragment_size   = 0;
-  
+
   this->next_ts         = 0;
   this->next_seq        = 0;
 
@@ -1656,13 +1656,13 @@
     real_free_mdpr(this->video_streams[i].mdpr);
     free(this->video_streams[i].index);
   }
-  
+
   for(i = 0; i < this->num_audio_streams; i++) {
     real_free_mdpr(this->audio_streams[i].mdpr);
     free(this->audio_streams[i].index);
     free(this->audio_streams[i].frame_buffer);
   }
-  
+
   free(this->fragment_tab);
   free(this);
 }
@@ -1702,7 +1702,7 @@
 
   if ( len < 4 )
     return -1;
-  
+
   if ( memcmp(buf, "\x2eRMF", 4) == 0 )
     return 1;
 
@@ -1730,7 +1730,7 @@
   case METHOD_BY_CONTENT:
     if ( stream_type < 1 )
       return NULL;
-    
+
     lprintf ("by content accepted.\n");
     break;
 
@@ -1777,7 +1777,7 @@
     "audio/x-pn-realaudio: ra, rm, ram: Real Media file;"
     "audio/x-pn-realaudio-plugin: rpm: Real Media plugin file;"
     "audio/x-real-audio: ra, rm, ram: Real Media file;"
-    "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; 
+    "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;";
   this->demux_class.extensions      = "rm rmvb ram";
   this->demux_class.dispose         = default_demux_class_dispose;
 

diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -63,7 +63,7 @@
 
   off_t                data_start;
   off_t                data_size;
-  
+
   uint32_t             cfs;
   uint16_t             w, h;
   int                  frame_len;
@@ -95,7 +95,7 @@
 
   /* read version */
   const uint16_t version = _X_BE_16(&file_header[0x04]);
-  
+
   /* read header size according to version */
   if (version == 3)
     this->header_size = _X_BE_16(&file_header[0x06]) + 8;
@@ -105,45 +105,45 @@
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_realaudio: unknown version number %d\n", version);
     return 0;
   }
-    
+
   /* allocate for and read header data */
   this->header = malloc(this->header_size);
-  
+
   if (!this->header || _x_demux_read_header(this->input, this->header, this->header_size) != this->header_size) {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_realaudio: unable to read header\n");
     free(this->header);
     return 0;
   }
-    
+
   off_t offset;
   /* read header data according to version */
   if((version == 3) && (this->header_size >= 32)) {
     this->data_size = _X_BE_32(&this->header[0x12]);
-    
+
     this->block_align = 240;
-    
+
     offset = 0x16;
   } else if(this->header_size >= 72) {
-    this->data_size = _X_BE_32(&this->header[0x1C]);    
-    
+    this->data_size = _X_BE_32(&this->header[0x1C]);
+
     this->block_align = _X_BE_16(&this->header[0x2A]);
-    
+
     if(this->header[0x3D] == 4)
       this->fourcc = _X_ME_32(&this->header[0x3E]);
     else {
-      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	      "demux_realaudio: invalid fourcc size %d\n", this->header[0x3D]);
       free(this->header);
       return 0;
     }
-    
+
     offset = 0x45;
   } else {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_realaudio: header too small\n");
     free(this->header);
     return 0;
   }
-  
+
   /* Read title */
   {
     const uint8_t len = this->header[offset];
@@ -154,7 +154,7 @@
     } else
       offset++;
   }
-  
+
   /* Author */
   {
     const uint8_t len = this->header[offset];
@@ -165,7 +165,7 @@
     } else
       offset++;
   }
-  
+
   /* Copyright/Date */
   {
     const uint8_t len = this->header[offset];
@@ -176,23 +176,23 @@
     } else
       offset++;
   }
-  
+
   /* Fourcc for version 3 comes after meta info */
   if(version == 3) {
     if (((offset+7) <= this->header_size)) {
       if(this->header[offset+2] == 4)
         this->fourcc = _X_ME_32(&this->header[offset+3]);
       else {
-        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	        "demux_realaudio: invalid fourcc size %d\n", this->header[offset+2]);
         free(this->header);
         return 0;
       }
     } else {
-      this->fourcc = ME_FOURCC('l', 'p', 'c', 'J'); 
+      this->fourcc = ME_FOURCC('l', 'p', 'c', 'J');
     }
   }
-  
+
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, this->fourcc);
   this->audio_type = _x_formattag_to_buf_audio(this->fourcc);
 
@@ -219,7 +219,7 @@
     if (this->audio_type == BUF_AUDIO_28_8 || this->audio_type == BUF_AUDIO_SIPRO)
       this->block_align = this->cfs;
   }
- 
+
   /* seek to start of data */
   this->data_start = this->header_size;
   if (this->input->seek(this->input, this->data_start, SEEK_SET) !=
@@ -242,7 +242,7 @@
   /* just load data chunks from wherever the stream happens to be
    * pointing; issue a DEMUX_FINISHED status if EOF is reached */
   if( this->input->get_length (this->input) )
-    current_normpos = (int)( (double) (this->input->get_current_pos (this->input) - this->data_start) * 
+    current_normpos = (int)( (double) (this->input->get_current_pos (this->input) - this->data_start) *
                       65535 / this->data_size );
 
   const int64_t current_pts = 0;  /* let the engine sort out the pts for now */
@@ -255,11 +255,11 @@
   if (this->audio_type == BUF_AUDIO_28_8 || this->audio_type == BUF_AUDIO_SIPRO) {
     if (this->audio_type == BUF_AUDIO_SIPRO) {
       if(this->input->read(this->input, this->frame_buffer, this->frame_len) < this->frame_len) {
-	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		"demux_realaudio: failed to read audio chunk\n");
-	
+
 	this->status = DEMUX_FINISHED;
-	return this->status; 
+	return this->status;
       }
       demux_real_sipro_swap (this->frame_buffer, this->frame_len * 2 / 96);
     } else {
@@ -270,25 +270,25 @@
 	  const int pos = x * 2 * this->w + y * this->cfs;
 	  if(this->input->read(this->input, this->frame_buffer + pos,
 			       this->cfs) < this->cfs) {
-	    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		    "demux_realaudio: failed to read audio chunk\n");
-	    
+
 	    this->status = DEMUX_FINISHED;
-	    return this->status; 
+	    return this->status;
 	  }
 	}
     }
 
     _x_demux_send_data(this->audio_fifo,
- 		       this->frame_buffer, this->frame_size,
+		       this->frame_buffer, this->frame_size,
 		       current_pts, this->audio_type, 0,
 		       current_normpos, current_pts / 90, 0, 0);
-  } else if(_x_demux_read_send_data(this->audio_fifo, this->input, this->block_align, 
-                             current_pts, this->audio_type, 0, current_normpos, 
+  } else if(_x_demux_read_send_data(this->audio_fifo, this->input, this->block_align,
+                             current_pts, this->audio_type, 0, current_normpos,
                              current_pts / 90, 0, 0) < 0) {
-    this->status = DEMUX_FINISHED;                           
+    this->status = DEMUX_FINISHED;
   }
-  
+
   return this->status;
 }
 
@@ -314,9 +314,9 @@
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
     buf->type = this->audio_type;
     buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_FRAME_END;
-    
+
     buf->size = MIN(this->header_size, buf->max_size);
-    
+
     memcpy(buf->content, this->header, buf->size);
 
     this->audio_fifo->put (this->audio_fifo, buf);
@@ -364,7 +364,7 @@
 
 static void demux_ra_dispose (demux_plugin_t *this_gen) {
   demux_ra_t *this = (demux_ra_t *) this_gen;
-  
+
   free(this->header);
   free(this->frame_buffer);
   free(this);
@@ -424,7 +424,7 @@
     }
 
   break;
-  
+
   default:
     free (this);
     return NULL;
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -92,11 +92,11 @@
     return 0;
 
   /* check for the RoQ magic numbers */
-  static const uint8_t RoQ_MAGIC_STRING[] = 
+  static const uint8_t RoQ_MAGIC_STRING[] =
     { 0x10, 0x84, 0xFF, 0xFF, 0xFF, 0xFF };
   if( memcmp(preamble, RoQ_MAGIC_STRING, sizeof(RoQ_MAGIC_STRING)) != 0 )
     return 0;
-    
+
   this->bih.biSize = sizeof(xine_bmiheader);
   this->bih.biWidth = this->bih.biHeight = 0;
   this->wave.nChannels = 0;  /* assume no audio at first */
@@ -119,7 +119,7 @@
   while (i-- > 0) {
     /* if this read fails, then maybe it's just a really small RoQ file
      * (even less than 2 seconds) */
-    if (this->input->read(this->input, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != 
+    if (this->input->read(this->input, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
       RoQ_CHUNK_PREAMBLE_SIZE)
       break;
     chunk_type = _X_LE_16(&preamble[0]);
@@ -181,7 +181,7 @@
   off_t current_file_pos;
 
   /* fetch the next preamble */
-  if (this->input->read(this->input, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != 
+  if (this->input->read(this->input, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
     RoQ_CHUNK_PREAMBLE_SIZE) {
     this->status = DEMUX_FINISHED;
     return this->status;
@@ -193,21 +193,21 @@
   if ((chunk_type == RoQ_SOUND_MONO) || (chunk_type == RoQ_SOUND_STEREO)) {
 
     if( this->audio_fifo ) {
-        
+
       /* do this calculation carefully because I can't trust the
        * 64-bit numerical manipulation */
       audio_pts = this->audio_byte_count;
       audio_pts *= 90000;
       audio_pts /= (RoQ_AUDIO_SAMPLE_RATE * this->wave.nChannels);
       this->audio_byte_count += chunk_size - 8;  /* do not count the preamble */
-         
+
       current_file_pos = this->input->get_current_pos(this->input);
 
       /* send out the preamble */
       buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
       buf->type = BUF_AUDIO_ROQ;
       if( this->input->get_length (this->input) )
-        buf->extra_info->input_normpos = (int)( (double) (current_file_pos - RoQ_CHUNK_PREAMBLE_SIZE) * 
+        buf->extra_info->input_normpos = (int)( (double) (current_file_pos - RoQ_CHUNK_PREAMBLE_SIZE) *
                                      65535 / this->input->get_length (this->input) );
       buf->pts = 0;
       buf->size = RoQ_CHUNK_PREAMBLE_SIZE;
@@ -219,7 +219,7 @@
         buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
         buf->type = BUF_AUDIO_ROQ;
         if( this->input->get_length (this->input) )
-          buf->extra_info->input_normpos = (int)( (double) current_file_pos * 
+          buf->extra_info->input_normpos = (int)( (double) current_file_pos *
                                      65535 / this->input->get_length (this->input) );
         buf->pts = audio_pts;
 
@@ -256,7 +256,7 @@
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->type = BUF_VIDEO_ROQ;
     if( this->input->get_length (this->input) )
-      buf->extra_info->input_normpos = (int)( (double) (current_file_pos - RoQ_CHUNK_PREAMBLE_SIZE) * 
+      buf->extra_info->input_normpos = (int)( (double) (current_file_pos - RoQ_CHUNK_PREAMBLE_SIZE) *
                                      65535 / this->input->get_length (this->input) );
     buf->pts = this->video_pts_counter;
     buf->size = RoQ_CHUNK_PREAMBLE_SIZE;
@@ -267,7 +267,7 @@
       buf = this->video_fifo->buffer_pool_alloc (this->audio_fifo);
       buf->type = BUF_VIDEO_ROQ;
       if( this->input->get_length (this->input) )
-        buf->extra_info->input_normpos = (int)( (double) current_file_pos * 
+        buf->extra_info->input_normpos = (int)( (double) current_file_pos *
                                      65535 / this->input->get_length (this->input) );
       buf->pts = this->video_pts_counter;
 
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -83,7 +83,7 @@
   buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
   buf->type = BUF_AUDIO_SHORTEN;
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
+    buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
                                      65535 / this->input->get_length (this->input) );
   buf->pts = 0;
 
@@ -92,7 +92,7 @@
     buf->free_buffer(buf);
     this->status = DEMUX_FINISHED;
     return this->status;
-  } else 
+  } else
     buf->size = bytes_read;
 
   /* each buffer stands on its own */
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -2,19 +2,19 @@
  * Copyright (C) 2000-2003 the xine project
  * May 2003 - Miguel Freitas
  * This plugin was sponsored by 1Control
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -51,7 +51,7 @@
 #define CHECK_VPTS_INTERVAL 2*90000
 #define NETWORK_PREBUFFER   90000
 
-typedef struct {  
+typedef struct {
   demux_plugin_t      demux_plugin;
 
   xine_stream_t       *stream;
@@ -86,7 +86,7 @@
   char fifo_name[11];
   uint8_t *p, *s;
   int64_t curvpts;
-  
+
   /* fill the scratch buffer */
   n = this->input->read(this->input, &this->scratch[this->scratch_used],
                         SCRATCH_SIZE - this->scratch_used);
@@ -402,7 +402,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -112,7 +112,7 @@
   if (this->input->read(this->input, header_chunk, 4) != 4)
     return 0;
   this->duration = _X_BE_32(&header_chunk[0]);
-  
+
   /* initial state: no video and no audio (until headers found) */
   this->video_type = this->audio_type = 0;
   this->input_length = this->input->get_length (this->input);
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -110,11 +110,11 @@
       this->audio_bytes_per_second = this->audio_channels *
         this->audio_sample_rate;
       break;
-    
+
     case 2:
       this->audio_type = BUF_AUDIO_LPCM_BE;
       this->audio_bits = 8;
-      this->audio_frames = this->data_size / 
+      this->audio_frames = this->data_size /
         (this->audio_channels * this->audio_bits / 8);
       this->audio_block_align = PCM_BLOCK_ALIGN;
       this->audio_bytes_per_second = this->audio_channels *
@@ -124,7 +124,7 @@
     case 3:
       this->audio_type = BUF_AUDIO_LPCM_BE;
       this->audio_bits = 16;
-      this->audio_frames = this->data_size / 
+      this->audio_frames = this->data_size /
         (this->audio_channels * this->audio_bits / 8);
       this->audio_block_align = PCM_BLOCK_ALIGN;
       this->audio_bytes_per_second = this->audio_channels *
@@ -163,7 +163,7 @@
   /* just load data chunks from wherever the stream happens to be
    * pointing; issue a DEMUX_FINISHED status if EOF is reached */
   remaining_sample_bytes = this->audio_block_align;
-  current_file_pos = 
+  current_file_pos =
     this->input->get_current_pos(this->input) - this->data_start;
 
   current_pts = current_file_pos;
@@ -205,7 +205,7 @@
       for (i = 0; i < buf->size; i++)
         buf->content[i] += 0x80;
     }
-    
+
     this->audio_fifo->put (this->audio_fifo, buf);
   }
   return this->status;
@@ -251,11 +251,11 @@
   demux_snd_t *this = (demux_snd_t *) this_gen;
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );
-  
+
   this->seek_flag = 1;
   this->status = DEMUX_OK;
   _x_demux_flush_engine (this->stream);
-  
+
   /* if input is non-seekable, do not proceed with the rest of this
    * seek function */
   if (!INPUT_IS_SEEKABLE(this->input))
@@ -358,7 +358,7 @@
   this->demux_class.mimetypes       =
     "audio/basic: snd,au: ULAW (Sun) audio;"
     "audio/x-basic: snd,au: ULAW (Sun) audio;"
-    "audio/x-pn-au: snd,au: ULAW (Sun) audio;"; 
+    "audio/x-pn-au: snd,au: ULAW (Sun) audio;";
   this->demux_class.extensions      = "snd au";
   this->demux_class.dispose         = default_demux_class_dispose;
 
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -102,7 +102,7 @@
  *       - then follows 16-bit RLE data until the EOD
  *         - RLE format: bits 15-10: # of 0s preceding this value (unsigned)
  *                       bits 9-0: this value (signed)
- *         - e.g. 3 bytes (2,10)(0,20)(3,30) -> 0 0 10 20 0 0 0 30 
+ *         - e.g. 3 bytes (2,10)(0,20)(3,30) -> 0 0 10 20 0 0 0 30
  *       - 16 bits: EOD (0xFE00)
  *   - 16 bits: 0xFE00 end-of-data footer
  */
@@ -367,7 +367,7 @@
      */
 
     if( this->data_size )
-      buf->extra_info->input_normpos = (int)( (double) current_pos * 
+      buf->extra_info->input_normpos = (int)( (double) current_pos *
                                      65535 / this->data_size );
     buf->extra_info->input_time = (current_pos*1000)/(CD_RAW_SECTOR_SIZE*75);
 
@@ -405,7 +405,7 @@
       }
 
       if( this->data_size )
-        buf->extra_info->input_normpos = (int)( (double) current_pos * 
+        buf->extra_info->input_normpos = (int)( (double) current_pos *
                                      65535 / this->data_size );
       buf->extra_info->input_time = (current_pos*1000)/(CD_RAW_SECTOR_SIZE*75);
 
@@ -524,7 +524,7 @@
 static int demux_str_get_stream_length (demux_plugin_t *this_gen) {
   demux_str_t *this = (demux_str_t *) this_gen;
 
-  return (int)((int64_t) this->input->get_length(this->input) 
+  return (int)((int64_t) this->input->get_length(this->input)
                 * 1000 / (CD_RAW_SECTOR_SIZE * 75));
 }
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -40,7 +40,7 @@
  *                  - demux HDMV/BluRay bitmap subtitles
  *
  * 28-Nov-2004 Mike Lampard <mlampard>
- *                  - Added support for PMT sections larger than 1 ts packet 
+ *                  - Added support for PMT sections larger than 1 ts packet
  *
  * 28-Aug-2004 James Courtier-Dutton <jcdutton>
  *                  - Improve PAT and PMT handling. Added some FIXME comments.
@@ -58,7 +58,7 @@
  *                  - dynamic allocation leaks fixes
  *
  * 27-May-2002 Giovanni Baronetti and Mauro Borghi <mauro.borghi@...>
- *                  - fill buffers before putting them in fifos 
+ *                  - fill buffers before putting them in fifos
  *                  - force PMT reparsing when PMT PID changes
  *                  - accept non seekable input plugins -- FIX?
  *                  - accept dvb as input plugin
@@ -180,7 +180,7 @@
 #define PKT_SIZE 188
 #define BODY_SIZE (188 - 4)
 /* more PIDS are needed due "auto-detection". 40 spare media entries  */
-#define MAX_PIDS ((BODY_SIZE - 1 - 13) / 4) + 40 
+#define MAX_PIDS ((BODY_SIZE - 1 - 13) / 4) + 40
 #define MAX_PMTS ((BODY_SIZE - 1 - 13) / 4) + 10
 #define SYNC_BYTE   0x47
 
@@ -290,7 +290,7 @@
   int pid;
   int media_index;
 } demux_ts_spu_lang;
-  
+
 /* Audio Channels */
 #define MAX_AUDIO_TRACKS 32
 
@@ -355,10 +355,10 @@
   unsigned int     pid_count;
   unsigned int     videoPid;
   unsigned int     videoMedia;
-  
+
   demux_ts_audio_track audio_tracks[MAX_AUDIO_TRACKS];
   int              audio_tracks_count;
-  
+
   int              send_end_buffers;
   int64_t          last_pts[2];
   int              send_newpts;
@@ -386,7 +386,7 @@
   int32_t npkt_read;
 
   uint8_t buf[BUF_SIZE]; /* == PKT_SIZE * NPKT_PER_READ */
-  
+
   int numPreview;
 
 } demux_ts_t;
@@ -426,7 +426,7 @@
        The original code worked well when the wrap happend like this:
 
        V7 A7 V8 V9 A9 Dv V0 V1 da A1 V2 V3 A3 V4
-       
+
        Legend:
        Vn = video packet with timestamp n
        An = audio packet with timestamp n
@@ -444,16 +444,16 @@
        a delay of almoust 26.5 hours!
 
        The new code gives the following sequences for the above examples:
-       
+
        V7 A7 V8 V9 A9 Dv V0 V1 A1 V2 V3 A3 V4
 
        V7 V8 A7 V9 Dv V0 Da A9 Dv V1 V2 A1 V3 V4 A3
 
        After proving this code it should be cleaned up to use just a single variable "last_pts". */
-    
+
 /*
     this->last_pts[video] = pts;
-*/    
+*/
     this->last_pts[video] = this->last_pts[1-video] = pts;
   }
 }
@@ -479,7 +479,7 @@
 static void demux_ts_update_spu_channel(demux_ts_t *this)
 {
   buf_element_t *buf;
-  
+
   this->current_spu_channel = this->stream->spu_channel;
 
   buf = this->video_fifo->buffer_pool_alloc(this->video_fifo);
@@ -488,7 +488,7 @@
   buf->decoder_flags = BUF_FLAG_SPECIAL;
   buf->decoder_info[1] = BUF_SPECIAL_SPU_DVB_DESCRIPTOR;
   buf->size = 0;
-    
+
   if (this->current_spu_channel >= 0
       && this->current_spu_channel < this->spu_langs_count)
     {
@@ -557,7 +557,7 @@
    * indicator set.
    */
   if (!pusi) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "demux_ts: demux error! PAT without payload unit start indicator\n");
     return;
   }
@@ -567,7 +567,7 @@
    */
   pkt += pkt[4];
   if (pkt - original_pkt > PKT_SIZE) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "demux_ts: demux error! PAT with invalid pointer\n");
     return;
   }
@@ -601,13 +601,13 @@
   }
[... 418 lines omitted ...]
+
   for (i=0; i<MAX_PIDS; i++) {
     demux_ts_media *m = &this->media[i];
 
-    if (m->buf != NULL) 
+    if (m->buf != NULL)
       m->buf->free_buffer(m->buf);
     m->buf            = NULL;
     m->counter        = INVALID_CC;
@@ -2203,7 +2203,7 @@
   }
 
   if( !playing ) {
-    
+
     this->status        = DEMUX_OK;
     this->buf_flag_seek = 0;
 
@@ -2213,7 +2213,7 @@
     _x_demux_flush_engine(this->stream);
 
   }
-  
+
   return this->status;
 }
 
@@ -2222,7 +2222,7 @@
   demux_ts_t*this = (demux_ts_t*)this_gen;
 
   if (this->rate)
-    return (int)((int64_t) this->input->get_length (this->input) 
+    return (int)((int64_t) this->input->get_length (this->input)
                  * 1000 / (this->rate * 50));
   else
     return 0;
@@ -2244,7 +2244,7 @@
   /* be a bit paranoid */
   if (this == NULL || this->stream == NULL)
     return DEMUX_OPTIONAL_UNSUPPORTED;
-  
+
   switch (data_type)
     {
     case DEMUX_OPTIONAL_DATA_AUDIOLANG:
@@ -2263,7 +2263,7 @@
       if (channel>=0 && channel<this->spu_langs_count) {
         memcpy(str, this->spu_langs[channel].desc.lang, 3);
 	str[3] = 0;}
-      else 
+      else
         strcpy(str, "none");
       return DEMUX_OPTIONAL_SUCCESS;
 
@@ -2299,10 +2299,10 @@
   return ts_detected;
 }
 
-static demux_plugin_t *open_plugin (demux_class_t *class_gen, 
-				    xine_stream_t *stream, 
+static demux_plugin_t *open_plugin (demux_class_t *class_gen,
+				    xine_stream_t *stream,
 				    input_plugin_t *input) {
-  
+
   demux_ts_t *this;
   int         i;
   int         hdmv = -1;
@@ -2319,9 +2319,9 @@
 
     if (detect_ts(buf, sizeof(buf), PKT_SIZE))
       hdmv = 0;
-    else if (detect_ts(buf, sizeof(buf), PKT_SIZE+4)) 
+    else if (detect_ts(buf, sizeof(buf), PKT_SIZE+4))
       hdmv = 1;
-    else 
+    else
       return NULL;
   }
     break;
@@ -2353,7 +2353,7 @@
   this->demux_plugin.get_capabilities  = demux_ts_get_capabilities;
   this->demux_plugin.get_optional_data = demux_ts_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
-  
+
   /*
    * Initialise our specialised data.
    */
@@ -2378,7 +2378,7 @@
   this->last_pmt_crc = 0;
 
   this->rate = 16000; /* FIXME */
-  
+
   this->status = DEMUX_FINISHED;
 
   /* DVBSUB */
@@ -2395,7 +2395,7 @@
   this->pkt_size   = PKT_SIZE + this->pkt_offset;
 
   this->numPreview=0;
-  
+
   return &this->demux_plugin;
 }
 
@@ -2403,9 +2403,9 @@
  * ts demuxer class
  */
 static void *init_class (xine_t *xine, void *data) {
-  
+
   demux_ts_class_t     *this;
-  
+
   this         = calloc(1, sizeof(demux_ts_class_t));
   this->config = xine->config;
   this->xine   = xine;
@@ -2436,7 +2436,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "mpeg-ts", XINE_VERSION_CODE, &demux_info_ts, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -140,7 +140,7 @@
 
     if ( bytes_to_read <= 0 )
       buf->decoder_flags |= BUF_FLAG_FRAME_END;
-    
+
     this->audio_fifo->put(this->audio_fifo, buf);
   }
 
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * Sierra Video and Music Data (.vmd) File Demuxer 
+ * Sierra Video and Music Data (.vmd) File Demuxer
  *   by Mike Melanson (melanson@...)
  * For more information on the VMD file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
@@ -109,7 +109,7 @@
   unsigned int total_frames;
   int64_t current_video_pts = 0;
 
-  if (_x_demux_read_header(this->input, vmd_header, VMD_HEADER_SIZE) != 
+  if (_x_demux_read_header(this->input, vmd_header, VMD_HEADER_SIZE) !=
     VMD_HEADER_SIZE)
     return 0;
 
@@ -234,7 +234,7 @@
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->type = BUF_VIDEO_VMD;
     if( this->data_size )
-      buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 
+      buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) *
                                               65535 / this->data_size);
     memcpy(buf->content, frame->frame_record, BYTES_PER_FRAME_RECORD);
     buf->size = BYTES_PER_FRAME_RECORD;
@@ -246,7 +246,7 @@
       buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
       buf->type = BUF_VIDEO_VMD;
       if( this->data_size )
-        buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 
+        buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) *
                                               65535 / this->data_size);
 
       if (remaining_bytes > buf->max_size)
@@ -277,7 +277,7 @@
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
     buf->type = BUF_AUDIO_VMD;
     if( this->data_size )
-      buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 
+      buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) *
                                               65535 / this->data_size);
     memcpy(buf->content, frame->frame_record, BYTES_PER_FRAME_RECORD);
     buf->size = BYTES_PER_FRAME_RECORD;
@@ -289,7 +289,7 @@
       buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
       buf->type = BUF_AUDIO_VMD;
       if( this->data_size )
-        buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 
+        buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) *
                                               65535 / this->data_size);
 
       if (remaining_bytes > buf->max_size)
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -93,7 +93,7 @@
   this->input->seek(this->input, first_block_offset, SEEK_SET);
 
   /* load the block preamble */
-  if (this->input->read(this->input, preamble, BLOCK_PREAMBLE_SIZE) != 
+  if (this->input->read(this->input, preamble, BLOCK_PREAMBLE_SIZE) !=
     BLOCK_PREAMBLE_SIZE)
     return 0;
 
@@ -142,7 +142,7 @@
   /* just load data chunks from wherever the stream happens to be
    * pointing; issue a DEMUX_FINISHED status if EOF is reached */
   remaining_sample_bytes = PCM_BLOCK_ALIGN;
-  current_file_pos = 
+  current_file_pos =
     this->input->get_current_pos(this->input) - this->data_start;
 
   current_pts = current_file_pos;
@@ -231,7 +231,7 @@
 
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );
-  
+
   this->seek_flag = 1;
   this->status = DEMUX_OK;
   _x_demux_flush_engine (this->stream);
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -87,7 +87,7 @@
     buf->size = buf->max_size;
 
   if( this->input->get_length (this->input) )
-    buf->extra_info->input_normpos = (int)( (double) current_file_pos * 
+    buf->extra_info->input_normpos = (int)( (double) current_file_pos *
                                      65535 / this->input->get_length (this->input) );
   buf->extra_info->input_time = audio_pts / 90;
   buf->pts = audio_pts;
@@ -160,7 +160,7 @@
 static int demux_vox_get_stream_length (demux_plugin_t *this_gen) {
   demux_vox_t *this = (demux_vox_t *) this_gen;
 
-  return (int)((int64_t)this->input->get_length(this->input) 
+  return (int)((int64_t)this->input->get_length(this->input)
                * 2 * 1000 / DIALOGIC_SAMPLERATE);
 }
 
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -25,7 +25,7 @@
  *
  * Quick technical note: VQA files begin with a header that includes a
  * frame index. This ought to be useful for seeking within a VQA file.
- * However, seeking is infeasible due to the audio encoding: Each audio 
+ * However, seeking is infeasible due to the audio encoding: Each audio
  * block needs information from the previous audio block in order to be
  * decoded, thus making random seeking difficult.
  */
@@ -108,7 +108,7 @@
     this->filesize = 1;
 
   /* load the VQA header */
-  if (this->input->read(this->input, vqa_header, VQA_HEADER_SIZE) != 
+  if (this->input->read(this->input, vqa_header, VQA_HEADER_SIZE) !=
     VQA_HEADER_SIZE)
     return 0;
 
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -177,7 +177,7 @@
         }
       }
       this->current_shot++;
-      
+
       /* this is the start of a new shot; send a new palette */
       if (this->input->read(this->input, preamble, 4) != 4) {
         this->status = DEMUX_FINISHED;
@@ -205,7 +205,7 @@
     } else if (chunk_tag == AUDI_TAG) {
       if( this->audio_fifo ) {
         audio_pts = this->video_pts - WC3_PTS_INC;
-  
+
         while (chunk_size) {
           buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
           buf->type = BUF_AUDIO_LPCM_LE;
@@ -213,23 +213,23 @@
             buf->extra_info->input_normpos = (int)( (double) current_file_pos * 65535 / this->data_size);
           buf->extra_info->input_time = audio_pts / 90;
           buf->pts = audio_pts;
-  
+
           if (chunk_size > buf->max_size)
             buf->size = buf->max_size;
           else
             buf->size = chunk_size;
           chunk_size -= buf->size;
-  
+
           if (this->input->read(this->input, buf->content, buf->size) !=
             buf->size) {
             buf->free_buffer(buf);
             this->status = DEMUX_FINISHED;
             break;
           }
-  
+
           if (!chunk_size)
             buf->decoder_flags |= BUF_FLAG_FRAME_END;
-  
+
           this->audio_fifo->put (this->audio_fifo, buf);
         }
       }else{
@@ -293,7 +293,7 @@
 
   /* load stream information */
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
-  /* this is not strictly correct-- some WC3 MVE files do not contain 
+  /* this is not strictly correct-- some WC3 MVE files do not contain
    * audio, but I'm too lazy to check if that is the case */
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,
@@ -376,7 +376,7 @@
   if (this->input->read(this->input, preamble, 4) != 4)
     return 0;
   this->number_of_shots = _X_LE_32(&preamble[0]);
-  
+
   /* allocate space for the shot offset index and set offsets to 0 */
   this->shot_offsets = xine_xcalloc(this->number_of_shots, sizeof(off_t));
   this->current_shot = 0;
@@ -540,13 +540,13 @@
   start_time /= 1000;
   start_pos = (off_t) ( (double) start_pos / 65535 *
               this->data_size );
-  
+
   this->status = DEMUX_OK;
   _x_demux_flush_engine(this->stream);
   this->seek_flag = 1;
 
   /* if input is non-seekable, do not proceed with the rest of this
-   * seek function */  
+   * seek function */
   if (!INPUT_IS_SEEKABLE(this->input))
     return this->status;
 
@@ -566,7 +566,7 @@
       chunk_size = (_X_BE_32(&preamble[4]) + 1) & (~1);
 
       if (chunk_tag == SHOT_TAG) {
-        this->shot_offsets[0] = 
+        this->shot_offsets[0] =
           this->input->get_current_pos(this->input) - PREAMBLE_SIZE;
         /* skip the four SHOT data bytes (palette index) */
         this->input->seek(this->input, 4, SEEK_CUR);
@@ -581,7 +581,7 @@
   start_pos += this->data_start;
   for (i = 0; i < this->number_of_shots - 1; i++) {
 
-    /* if the next shot offset has not been recorded, traverse through the 
+    /* if the next shot offset has not been recorded, traverse through the
      * file until it is found */
     if (this->shot_offsets[i + 1] == 0) {
       off_t current_pos;
@@ -607,7 +607,7 @@
         chunk_size = (_X_BE_32(&preamble[4]) + 1) & (~1);
 
         if (chunk_tag == SHOT_TAG) {
-          this->shot_offsets[i + 1] = 
+          this->shot_offsets[i + 1] =
             this->input->get_current_pos(this->input) - PREAMBLE_SIZE;
           /* skip the four SHOT data bytes (palette index) */
           this->input->seek(this->input, 4, SEEK_CUR);
@@ -620,7 +620,7 @@
 
     /* check if the seek-to offset falls in between this shot offset and
      * the next one */
-    if ((start_pos >= this->shot_offsets[i]) && 
+    if ((start_pos >= this->shot_offsets[i]) &&
         (start_pos <  this->shot_offsets[i + 1])) {
 
       new_shot = i;
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -69,7 +69,7 @@
   int                  aspect_d;
   int                  progressive;
   int                  top_field_first;
-  
+
   unsigned int         frame_pts_inc;
   unsigned int         frame_size;
 
@@ -86,7 +86,7 @@
   char *header_ptr, *header_endptr, *header_end;
 
   this->bih.biWidth = this->bih.biHeight = this->fps_n = this->fps_d =
-    this->aspect_n = this->aspect_d = this->progressive = 
+    this->aspect_n = this->aspect_d = this->progressive =
     this->top_field_first = this->data_start = 0;
 
   if (_x_demux_read_header(this->input, header, Y4M_HEADER_BYTES) != Y4M_HEADER_BYTES)
@@ -98,11 +98,11 @@
 
   /* null terminate the read data */
   header[Y4M_HEADER_BYTES] = '\0';
-  
+
   /* check for stream header terminator */
   if ((header_end = strchr(header, '\n')) == NULL)
     return 0;
-  
+
   /* read tagged fields in stream header */
   header_ptr = &header[Y4M_SIGNATURE_SIZE];
   while (header_ptr < header_end) {
@@ -111,7 +111,7 @@
       break;
     else
       header_ptr++;
-  
+
     switch (*header_ptr) {
       case 'W':
         /* read the width */
@@ -153,31 +153,31 @@
           return 0;
         else
           header_ptr = header_endptr;
-          
+
         /* denominator */
         this->fps_d = strtol(header_ptr + 1, &header_endptr, 10);
         if (header_endptr == header_ptr + 1)
           return 0;
         else
           header_ptr = header_endptr;
-        
+
         break;
       case 'A':
-        /* read aspect ratio - stored as a ratio(!) 
+        /* read aspect ratio - stored as a ratio(!)
          * numerator */
         this->aspect_n = strtol(header_ptr + 1, &header_endptr, 10);
         if ((header_endptr == header_ptr + 1) || (*header_endptr != ':'))
           return 0;
         else
           header_ptr = header_endptr;
-          
+
         /* denominator */
         this->aspect_d = strtol(header_ptr + 1, &header_endptr, 10);
         if (header_endptr == header_ptr + 1)
           return 0;
         else
           header_ptr = header_endptr;
-        
+
         break;
       default:
         /* skip whatever this is */
@@ -185,7 +185,7 @@
           header_ptr++;
     }
   }
-  
+
   /* make sure all the data was found */
   if (!this->bih.biWidth || !this->bih.biHeight || !this->fps_n || !this->fps_d)
     return 0;
@@ -194,8 +194,8 @@
   this->frame_size = this->bih.biWidth * this->bih.biHeight * 3 / 2;
 
   /* pts difference between frames */
-  this->frame_pts_inc = (90000 * this->fps_d) / this->fps_n;  
-  
+  this->frame_pts_inc = (90000 * this->fps_d) / this->fps_n;
+
   /* finally, look for the first frame */
   char *data_start_ptr = memmem(header_ptr, Y4M_HEADER_BYTES, "FRAME", 5);
 
@@ -204,7 +204,7 @@
     return 0;
 
   this->data_start = data_start_ptr - header;
-  
+
   /* compute size of all frames */
   if (INPUT_IS_SEEKABLE(this->input)) {
     this->data_size = this->input->get_length(this->input) -
@@ -271,9 +271,9 @@
       buf->decoder_flags |= BUF_FLAG_FRAME_END;
     this->video_fifo->put(this->video_fifo, buf);
   }
-  
+
   return this->status;
-} 
+}
 
 static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) {
   demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen;
@@ -299,13 +299,13 @@
   buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
                        BUF_FLAG_FRAME_END;
   buf->decoder_info[0] = this->frame_pts_inc;  /* initial video step */
-  
+
   if(this->aspect_n && this->aspect_d) {
     buf->decoder_flags  |= BUF_FLAG_ASPECT;
     buf->decoder_info[1] = this->bih.biWidth * this->aspect_n;
     buf->decoder_info[2] = this->bih.biHeight * this->aspect_d;
   }
-    
+
   buf->decoder_info[3] = this->progressive;
   buf->decoder_info[4] = this->top_field_first;
 
@@ -327,7 +327,7 @@
 
      /* YUV4MPEG2 files are essentially constant bit-rate video. Seek along
       * the calculated frame boundaries. Divide the requested seek offset
-      * by the frame size integer-wise to obtain the desired frame number 
+      * by the frame size integer-wise to obtain the desired frame number
       * and then multiply the frame number by the frame size to get the
       * starting offset. Add the data_start offset to obtain the final
       * offset. */
@@ -364,7 +364,7 @@
 static int demux_yuv4mpeg2_get_stream_length (demux_plugin_t *this_gen) {
   demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen;
 
-  return (int)(((int64_t) this->data_size * 1000 * this->fps_d) / 
+  return (int)(((int64_t) this->data_size * 1000 * this->fps_d) /
                ((this->frame_size + Y4M_FRAME_SIGNATURE_SIZE) * this->fps_n));
 }
 
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -1,19 +1,19 @@
 /*
  * Copyright (C) 2003-2004 the xine project
  * Copyright (C) 2003 Jeroen Asselman <j.asselman@...>
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -120,27 +120,27 @@
 
   this->video_fifo  = this->stream->video_fifo;
   this->audio_fifo  = this->stream->audio_fifo;
- 
+
   _x_demux_control_start(this->stream);
 
   if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO)) {
     buf = this->input->read_block(this->input, this->audio_fifo, 0);
-    
+
     if (buf)
       this->audio_fifo->put(this->audio_fifo, buf);
     else
       this->status = DEMUX_FINISHED;
   }
-  
+
   if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) {
     buf = this->input->read_block(this->input, this->video_fifo, 0);
-    
+
     if (buf)
       this->video_fifo->put(this->video_fifo, buf);
     else
       this->status = DEMUX_FINISHED;
   }
-  
+
   this->status = DEMUX_OK;
 }
 
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -40,7 +40,7 @@
 
 ebml_parser_t *new_ebml_parser (xine_t *xine, input_plugin_t *input) {
   ebml_parser_t *ebml;
-  
+
   ebml = xine_xmalloc(sizeof(ebml_parser_t));
   ebml->xine                 = xine;
   ebml->input                = input;
@@ -50,7 +50,7 @@
 
 
 void dispose_ebml_parser(ebml_parser_t *ebml) {
-  free(ebml);  
+  free(ebml);
 }
 
 
@@ -122,7 +122,7 @@
   int ff_bytes;
   uint64_t value;
   int i;
-                                                                                
+
   if (ebml->input->read(ebml->input, data, 1) != 1) {
     off_t pos = ebml->input->get_current_pos(ebml->input);
     xprintf(ebml->xine, XINE_VERBOSITY_LOG,
@@ -152,7 +152,7 @@
     ff_bytes = 1;
   else
     ff_bytes = 0;
-  
+
   /* read the rest of the len */
   if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) {
     off_t pos = ebml->input->get_current_pos(ebml->input);
@@ -221,7 +221,7 @@
             "ebml: Invalid integer element size %" PRIu64 "\n", size);
     return 0;
   }
-  
+
   if (!ebml_read_elem_data (ebml, data, size))
     return 0;
 
@@ -244,7 +244,7 @@
             "ebml: Invalid integer element size %" PRIu64 "\n", size);
     return 0;
   }
-  
+
   if (!ebml_read_elem_data(ebml, data, size))
     return 0;
 
@@ -253,7 +253,7 @@
     *num = -1;
   else
     *num = 0;
-  
+
   while (size > 0) {
     *num = (*num << 8) | data[elem->len - size];
     size--;
@@ -302,7 +302,7 @@
 
   if (!ebml_read_elem_data(ebml, str, size))
     return 0;
-  
+
   return 1;
 }
 
@@ -347,7 +347,7 @@
   top_elem->start = elem->start;
   top_elem->len = elem->len;
   top_elem->id = elem->id;
-  
+
   ebml->level++;
   lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
   if (ebml->level >= EBML_STACK_SIZE) {
@@ -371,20 +371,20 @@
             "ebml: invalid master element\n");
     return 0;
   }
-  
+
   if (master.id != EBML_ID_EBML) {
     xprintf(ebml->xine, XINE_VERBOSITY_LOG,
             "ebml: invalid master element\n");
     return 0;
   }
-  
+
   if (!ebml_read_master (ebml, &master))
     return 0;
 
   next_level = 1;
   while (next_level == 1) {
     ebml_elem_t elem;
-    
+
     if (!ebml_read_elem_head(ebml, &elem))
       return 0;
 
@@ -398,7 +398,7 @@
         ebml->version = num;
         break;
       }
-      
+
       case EBML_ID_EBMLREADVERSION: {
         uint64_t num;
 
diff --git a/src/demuxers/ebml.h b/src/demuxers/ebml.h
--- a/src/demuxers/ebml.h
+++ b/src/demuxers/ebml.h
@@ -48,7 +48,7 @@
   /* xine stuff */
   xine_t                *xine;
   input_plugin_t        *input;
-  
+
   /* EBML Parser Stack Management */
   ebml_elem_t            elem_stack[EBML_STACK_SIZE];
   int                    level;
@@ -61,7 +61,7 @@
   char                  *doctype;
   uint64_t               doctype_version;
   uint64_t               doctype_read_version;
-  
+
 } ebml_parser_t;
 
 
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -98,7 +98,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "aac",       XINE_VERSION_CODE, &demux_info_aac,       demux_aac_init_plugin },
   { PLUGIN_DEMUX, 27, "ac3",       XINE_VERSION_CODE, &demux_info_ac3,       demux_ac3_init_plugin },
   { PLUGIN_DEMUX, 27, "aud",       XINE_VERSION_CODE, &demux_info_aud,       demux_aud_init_plugin },
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
--- a/src/demuxers/group_audio.h
+++ b/src/demuxers/group_audio.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c
--- a/src/demuxers/group_games.c
+++ b/src/demuxers/group_games.c
@@ -78,7 +78,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_DEMUX, 27, "wve",      XINE_VERSION_CODE, &demux_info_eawve,    demux_eawve_init_plugin},
   { PLUGIN_DEMUX, 27, "idcin",    XINE_VERSION_CODE, &demux_info_idcin,    demux_idcin_init_plugin },
   { PLUGIN_DEMUX, 27, "ipmovie",  XINE_VERSION_CODE, &demux_info_ipmovie,  demux_ipmovie_init_plugin },
diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h
--- a/src/demuxers/group_games.h
+++ b/src/demuxers/group_games.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -29,7 +29,7 @@
  *
  * ID3v2 specs: http://www.id3.org/
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -84,7 +84,7 @@
    "UTF-16",       /* 0x01 */
    "UTF-16BE",     /* 0x02 */
    "UTF-8"};       /* 0x03 */
-   
+
 int id3v1_parse_tag (input_plugin_t *input, xine_stream_t *stream) {
 
   off_t len;
@@ -113,7 +113,7 @@
       if (tag.genre < ID3_GENRE_COUNT) {
         _x_meta_info_set(stream, XINE_META_INFO_GENRE, id3_genre[tag.genre]);
       }
-      
+
     }
     return 1;
   } else {
@@ -126,12 +126,12 @@
   int state = 0;
   char *buf = dest;
   unsigned int index = 0;
-  
+
   while (*src) {
     lprintf("state=%d\n", state);
     if ((buf - dest) >= len)
       return 0;
-      
+
     switch (state) {
       case 0:
         /* initial state */
@@ -276,7 +276,7 @@
   const size_t bufsize = frame_header->size + 2;
   if ( bufsize < 3 ) /* frames has to be _at least_ 1 byte */
     return 0;
-  char buf[bufsize];  
+  char buf[bufsize];
   int enc;
 
   if (input->read (input, buf, frame_header->size) == frame_header->size) {
@@ -290,7 +290,7 @@
       case ( BE_FOURCC(0, 'T', 'C', 'O') ):
         {
           char tmp[1024];
-          
+
           if (id3v2_parse_genre(tmp, buf + 1, 1024)) {
             _x_meta_info_set(stream, XINE_META_INFO_GENRE, tmp);
           }
@@ -344,21 +344,21 @@
 
     if (tag_header.flags & ID3V22_ZERO_FLAG) {
       /* invalid flags */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": invalid header flags (%02x)\n", tag_header.flags);
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
     }
     if (tag_header.flags & ID3V22_COMPRESS_FLAG) {
       /* compressed tag: not supported */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": compressed tags are not supported\n");
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
     }
     if (tag_header.flags & ID3V22_UNSYNCH_FLAG) {
       /* unsynchronized tag: not supported */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": unsynchronized tags are not supported\n");
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
@@ -370,11 +370,11 @@
         if (tag_frame_header.id) {
           if ((pos + tag_frame_header.size) <= tag_header.size) {
             if (!id3v22_interp_frame(input, stream, &tag_frame_header)) {
-              xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+              xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                       LOG_MODULE ": invalid frame content\n");
             }
           } else {
-            xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+            xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                     LOG_MODULE ": invalid frame header\n");
             input->seek (input, tag_header.size - pos, SEEK_CUR);
             return 1;
@@ -386,7 +386,7 @@
           return 1;
         }
       } else {
-        xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                 LOG_MODULE ": id3v2_parse_frame_header problem\n");
         return 0;
       }
@@ -425,9 +425,9 @@
   uint8_t buf[14];
 
   if (input->read (input, buf, 4) == 4) {
-  
+
     frame_ext_header->size  = _X_BE_32(&buf[0]);
-    
+
     if (frame_ext_header->size == 6) {
       if (input->read (input, buf + 4, 6) == 6) {
         frame_ext_header->flags = _X_BE_16(buf + 4);
@@ -435,7 +435,7 @@
         frame_ext_header->crc = 0;
       } else {
         return 0;
-      }        
+      }
 
     } else if (frame_ext_header->size == 10) {
       if (input->read (input, buf + 4, 10) == 10) {
@@ -480,7 +480,7 @@
       case ( BE_FOURCC('T', 'C', 'O', 'N') ):
         {
           char tmp[1024];
-          
+
           if (id3v2_parse_genre(tmp, buf + 1, 1024)) {
             _x_meta_info_set(stream, XINE_META_INFO_GENRE, tmp);
           }
@@ -534,14 +534,14 @@
 
     if (tag_header.flags & ID3V23_ZERO_FLAG) {
       /* invalid flags */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": invalid header flags (%02x)\n", tag_header.flags);
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
     }
     if (tag_header.flags & ID3V23_UNSYNCH_FLAG) {
       /* unsynchronized tag: not supported */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": unsynchronized tags are not supported\n");
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
@@ -560,11 +560,11 @@
         if (tag_frame_header.id) {
           if ((pos + tag_frame_header.size) <= tag_header.size) {
             if (!id3v23_interp_frame(input, stream, &tag_frame_header)) {
-              xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+              xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                       LOG_MODULE ": invalid frame content\n");
             }
           } else {
-            xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+            xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                     LOG_MODULE ": invalid frame header\n");
             input->seek (input, tag_header.size - pos, SEEK_CUR);
             return 1;
@@ -577,7 +577,7 @@
           return 1;
         }
       } else {
-        xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                 LOG_MODULE ": id3v2_parse_frame_header problem\n");
         return 0;
       }
@@ -594,7 +594,7 @@
 /* id3v2 "genre" parsing code. what a ugly format ! */
 static int id3v24_parse_genre(char* dest, char *src, int len) {
   unsigned int index = 0;
-  
+
   dest[0] = '\0';
   if (sscanf(src, "%u", &index) == 1) {
     if (index < ID3_GENRE_COUNT) {
@@ -632,7 +632,7 @@
   uint8_t buf[5];
 
   if (input->read (input, buf, 4) == 4) {
- 
+
     frame_ext_header->size  = _X_BE_32(&buf[0]);
 
     if (input->read (input, buf, 2) == 2) {
@@ -722,14 +722,14 @@
     enc = buf[0];
     if( enc >= ID3_ENCODING_COUNT )
       enc = 0;
-      
+
     lprintf("data: %s\n", buf+1);
 
     switch (frame_header->id) {
       case ( BE_FOURCC('T', 'C', 'O', 'N') ):
         {
           char tmp[1024];
-          
+
           if (id3v24_parse_genre(tmp, buf + 1, 1024)) {
             _x_meta_info_set(stream, XINE_META_INFO_GENRE, tmp);
           }
@@ -784,7 +784,7 @@
 
     if (tag_header.flags & ID3V24_ZERO_FLAG) {
       /* invalid flags */
-      xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
               LOG_MODULE ": invalid header flags (%02x)\n", tag_header.flags);
       input->seek (input, tag_header.size - pos, SEEK_CUR);
       return 0;
@@ -809,11 +809,11 @@
         if (tag_frame_header.id) {
           if ((pos + tag_frame_header.size) <= tag_header.size) {
             if (!id3v24_interp_frame(input, stream, &tag_frame_header)) {
-              xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+              xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                       LOG_MODULE ": invalid frame content\n");
             }
           } else {
-            xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+            xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                     LOG_MODULE ": invalid frame header\n");
             input->seek (input, tag_header.size - pos, SEEK_CUR);
             return 1;
@@ -825,7 +825,7 @@
           return 1;
         }
       } else {
-        xprintf(stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
                 LOG_MODULE ": id3v2_parse_frame_header problem\n");
         return 0;
       }
@@ -850,7 +850,7 @@
   case ID3V22_TAG:
     xprintf(stream->xine, XINE_VERBOSITY_LOG, LOG_MODULE ": ID3V2.2 tag\n");
     return id3v22_parse_tag(input, stream, id3_signature);
-   
+
   case ID3V23_TAG:
     xprintf(stream->xine, XINE_VERBOSITY_LOG, LOG_MODULE ": ID3V2.3 tag\n");
     return id3v23_parse_tag(input, stream, id3_signature);
diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h
--- a/src/demuxers/matroska.h
+++ b/src/demuxers/matroska.h
@@ -272,7 +272,7 @@
   uint32_t                 codec_private_len;
   int                      default_flag;
   uint32_t                 compress_algo;
-  
+
   uint32_t                 buf_type;
   fifo_buffer_t           *fifo;
 
diff --git a/src/demuxers/qtpalette.h b/src/demuxers/qtpalette.h
--- a/src/demuxers/qtpalette.h
+++ b/src/demuxers/qtpalette.h
@@ -11,7 +11,7 @@
   0x93, 0x65, 0x5E, 0x00,
   0xFF, 0xFF, 0xFF, 0x00,
   0xDF, 0xD0, 0xAB, 0x00,
-  0x00, 0x00, 0x00, 0x00 
+  0x00, 0x00, 0x00, 0x00
 };
 
 static const unsigned char qt_default_palette_16[16 * 4] = {
@@ -30,7 +30,7 @@
   0xFF, 0xFB, 0xF9, 0x00,
   0xE8, 0xCA, 0xC5, 0x00,
   0x8A, 0x7C, 0x77, 0x00,
-  0x00, 0x00, 0x00, 0x00 
+  0x00, 0x00, 0x00, 0x00
 };
 
 static const unsigned char qt_default_palette_256[256 * 4] = {
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = 
+AM_CPPFLAGS =
 AM_LDFLAGS  = $(xineplug_ldflags)
 
 if HAVE_X11
@@ -43,7 +43,7 @@
 	ffmpeg_encoder.c \
 	dxr3_spu_encoder.c \
 	dxr3_scr.c \
-	video_out_dxr3.c 
+	video_out_dxr3.c
 
 xineplug_vo_out_dxr3_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEG_CFLAGS)
 xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LIBS) -lm
diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h
--- a/src/dxr3/dxr3.h
+++ b/src/dxr3/dxr3.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -45,7 +45,7 @@
 static inline int dxr3_present(xine_stream_t *stream)
 {
   int present = 0;
-  
+
   if (stream->video_driver && stream->video_driver->node &&
       stream->video_driver->node->plugin_class ) {
     const video_driver_class_t *const vo_class = (video_driver_class_t *)stream->video_driver->node->plugin_class;
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
- 
+
 /* dxr3 spu decoder plugin.
  * Accepts the spu data from xine and sends it directly to the
  * corresponding dxr3 device. Also handles dvd menu button highlights.
@@ -76,7 +76,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_SPU_DECODER, 17, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -111,7 +111,7 @@
 
 typedef struct dxr3_spudec_class_s {
   spu_decoder_class_t      spu_decoder_class;
-  
+
   int                      instance;     /* we allow only one instance of this plugin */
 } dxr3_spudec_class_t;
 
@@ -121,10 +121,10 @@
   xine_stream_t           *stream;
   dxr3_driver_t           *dxr3_vo;      /* we need to talk to the video out */
   xine_event_queue_t      *event_queue;
-  
+
   int                      devnum;
   int                      fd_spu;       /* to access the dxr3 spu device */
-  
+
   dxr3_spu_stream_state_t  spu_stream_state[MAX_SPU_STREAMS];
   uint32_t                 clut[16];     /* the current color lookup table */
   int                      menu;         /* are we in a menu? */
@@ -132,7 +132,7 @@
   pci_node_t               pci_cur;      /* a list of PCI packs, with the list head being current */
   pthread_mutex_t          pci_lock;
   uint32_t                 buttonN;      /* currently highlighted button */
-  
+
   int                      anamorphic;   /* this is needed to detect anamorphic menus */
 } dxr3_spudec_t;
 
@@ -160,7 +160,7 @@
 static inline void dxr3_spudec_update_nav(dxr3_spudec_t *this)
 {
   metronom_clock_t *clock = this->stream->xine->clock;
-  
+
   if (this->pci_cur.next && this->pci_cur.next->vpts <= clock->get_current_time(clock)) {
     pci_node_t *node = this->pci_cur.next;
     xine_fast_memcpy(&this->pci_cur, this->pci_cur.next, sizeof(pci_node_t));
@@ -180,17 +180,17 @@
 static void *dxr3_spudec_init_plugin(xine_t *xine, void* data)
 {
   dxr3_spudec_class_t *this;
-  
+
   this = calloc(1, sizeof(dxr3_spudec_class_t));
   if (!this) return NULL;
-  
+
   this->spu_decoder_class.open_plugin     = dxr3_spudec_open_plugin;
   this->spu_decoder_class.identifier      = "dxr3-spudec";
   this->spu_decoder_class.description     = N_("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card");
   this->spu_decoder_class.dispose         = default_spu_decoder_class_dispose;
-  
+
   this->instance                          = 0;
-  
+
   return &this->spu_decoder_class;
 }
 
@@ -200,20 +200,20 @@
   dxr3_spudec_t *this;
   dxr3_spudec_class_t *class = (dxr3_spudec_class_t *)class_gen;
   char tmpstr[128];
-  
+
   if (class->instance) return NULL;
   if (!dxr3_present(stream)) return NULL;
-  
+
   this = calloc(1, sizeof(dxr3_spudec_t));
   if (!this) return NULL;
-  
+
   this->spu_decoder.decode_data       = dxr3_spudec_decode_data;
   this->spu_decoder.reset             = dxr3_spudec_reset;
   this->spu_decoder.discontinuity     = dxr3_spudec_discontinuity;
   this->spu_decoder.dispose           = dxr3_spudec_dispose;
   this->spu_decoder.get_interact_info = dxr3_spudec_interact_info;
   this->spu_decoder.set_button        = dxr3_spudec_set_button;
-  
[... 242 lines omitted ...]
   dxr3_spudec_update_nav(this);
   memcpy(data, &this->pci_cur.pci, sizeof(pci_t));
@@ -578,7 +578,7 @@
 {
   dxr3_spudec_t *this = (dxr3_spudec_t *)this_gen;
   em8300_button_t btn;
-  
+
   llprintf(LOG_BTN, "setting button\n");
   this->buttonN = button;
   pthread_mutex_lock(&this->pci_lock);
@@ -587,7 +587,7 @@
       (dxr3_spudec_copy_nav_to_btn(this, mode - 1, &btn ) > 0)) {
     pthread_mutex_lock(&this->dxr3_vo->spu_device_lock);
     if (ioctl(this->fd_spu, EM8300_IOCTL_SPU_BUTTON, &btn))
-      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	      "dxr3_decode_spu: failed to set spu button (%s)\n", strerror(errno));
     pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
   }
@@ -602,7 +602,7 @@
 static void dxr3_spudec_process_nav(dxr3_spudec_t *this)
 {
   em8300_button_t btn;
-  
+
   this->menu = 1;
   this->button_filter = 0;
   if (this->pci_cur.pci.hli.hl_gi.fosl_btnn > 0) {
@@ -618,15 +618,15 @@
   if ((dxr3_spudec_copy_nav_to_btn(this, 0, &btn ) > 0)) {
     pthread_mutex_lock(&this->dxr3_vo->spu_device_lock);
     if (ioctl(this->fd_spu, EM8300_IOCTL_SPU_BUTTON, &btn))
-      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
         "dxr3_decode_spu: failed to set spu button (%s)\n", strerror(errno));
     pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
   } else {
     /* current button does not exist -> use another one */
     xine_event_t event;
-    
+
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("requested button not available\n"));
-    
+
     if (this->buttonN > this->pci_cur.pci.hli.hl_gi.btn_ns)
       this->buttonN = this->pci_cur.pci.hli.hl_gi.btn_ns;
     else
@@ -636,11 +636,11 @@
     event.data         = &this->buttonN;
     event.data_length  = sizeof(this->buttonN);
     xine_event_send(this->stream, &event);
-    
+
     if ((dxr3_spudec_copy_nav_to_btn(this, 0, &btn ) > 0)) {
       pthread_mutex_lock(&this->dxr3_vo->spu_device_lock);
       if (ioctl(this->fd_spu, EM8300_IOCTL_SPU_BUTTON, &btn))
-	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	 "dxr3_decode_spu: failed to set spu button (%s)\n", strerror(errno));
       pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
     } else {
@@ -652,10 +652,10 @@
 static int dxr3_spudec_copy_nav_to_btn(dxr3_spudec_t *this, int32_t mode, em8300_button_t *btn)
 {
   btni_t *button_ptr = NULL;
-  
+
   if ((this->buttonN <= 0) || (this->buttonN > this->pci_cur.pci.hli.hl_gi.btn_ns))
     return -1;
-  
+
   /* choosing a button from a matching button group */
   if (this->anamorphic &&
       !this->dxr3_vo->widescreen_enabled &&
@@ -663,7 +663,7 @@
       this->stream->spu_channel_letterbox != this->stream->spu_channel &&
       this->stream->spu_channel_letterbox >= 0) {
     unsigned int btns_per_group = 36 / this->pci_cur.pci.hli.hl_gi.btngr_ns;
-    
+
     /* use a letterbox button group for letterboxed anamorphic menus on tv out */
     if (!button_ptr && this->pci_cur.pci.hli.hl_gi.btngr_ns >= 1 && (this->pci_cur.pci.hli.hl_gi.btngr1_dsp_ty & 2))
       button_ptr = &this->pci_cur.pci.hli.btnit[0 * btns_per_group + this->buttonN - 1];
@@ -671,13 +671,13 @@
       button_ptr = &this->pci_cur.pci.hli.btnit[1 * btns_per_group + this->buttonN - 1];
     if (!button_ptr && this->pci_cur.pci.hli.hl_gi.btngr_ns >= 3 && (this->pci_cur.pci.hli.hl_gi.btngr3_dsp_ty & 2))
       button_ptr = &this->pci_cur.pci.hli.btnit[2 * btns_per_group + this->buttonN - 1];
-    
+
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "No suitable letterbox button group found.\n");
     _x_assert(button_ptr);
-    
+
   } else {
     unsigned int btns_per_group = 36 / this->pci_cur.pci.hli.hl_gi.btngr_ns;
-    
+
     /* otherwise use a normal 4:3 or widescreen button group */
     if (!button_ptr && this->pci_cur.pci.hli.hl_gi.btngr_ns >= 1 && !(this->pci_cur.pci.hli.hl_gi.btngr1_dsp_ty & 6))
       button_ptr = &this->pci_cur.pci.hli.btnit[0 * btns_per_group + this->buttonN - 1];
@@ -685,14 +685,14 @@
       button_ptr = &this->pci_cur.pci.hli.btnit[1 * btns_per_group + this->buttonN - 1];
     if (!button_ptr && this->pci_cur.pci.hli.hl_gi.btngr_ns >= 3 && !(this->pci_cur.pci.hli.hl_gi.btngr3_dsp_ty & 6))
       button_ptr = &this->pci_cur.pci.hli.btnit[2 * btns_per_group + this->buttonN - 1];
-    
+
   }
   if (!button_ptr) {
-    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	    "dxr3_decode_spu: No suitable menu button group found, using group 1.\n");
     button_ptr = &this->pci_cur.pci.hli.btnit[this->buttonN - 1];
   }
-  
+
   if(button_ptr->btn_coln != 0) {
     llprintf(LOG_BTN, "normal button clut, mode %d\n", mode);
     btn->color = (this->pci_cur.pci.hli.btn_colit.btn_coli[button_ptr->btn_coln-1][mode] >> 16);
@@ -702,7 +702,7 @@
     btn->right = button_ptr->x_end;
     btn->bottom = button_ptr->y_end;
     return 1;
-  } 
+  }
   return -1;
 }
 

diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
- 
+
 /* dxr3 video decoder plugin.
  * Accepts the video data from xine and sends it directly to the
  * corresponding dxr3 device. Takes precedence over the libmpeg2
@@ -77,7 +77,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER, 19, "dxr3-mpeg2", XINE_VERSION_CODE, &dxr3_video_decoder_info, &dxr3_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -96,9 +96,9 @@
 /* plugin structures */
 typedef struct dxr3_decoder_class_s {
   video_decoder_class_t  video_decoder_class;
-  
+
   int                    instance;             /* we allow only one instance of this plugin */
-  
+
   metronom_clock_t      *clock;                /* used for syncing */
 } dxr3_decoder_class_t;
 
@@ -107,11 +107,11 @@
   dxr3_decoder_class_t  *class;
   xine_stream_t         *stream;
   dxr3_scr_t            *scr;                  /* shortcut to the scr plugin in the dxr3 video out */
-  
+
   int                    devnum;
   int                    fd_control;
   int                    fd_video;             /* to access the dxr3 devices */
-  
+
   int                    have_header_info;
   int                    sequence_open;
   int                    width;
@@ -120,26 +120,26 @@
   int                    aspect_code;
   int                    frame_rate_code;
   int                    repeat_first_field;   /* mpeg stream header data */
-  
+
   int                    force_aspect;         /* when input plugin has better info, we are forced */
   int                    force_pan_scan;       /* to use a certain aspect or to do pan&scan */
-  
+
   int                    use_panscan;
   int                    panscan_smart_change;
   int                    afd_smart_change;
   int                    afd_code;             /* use pan&scan info if present in stream */
-  
+
   int                    last_width;
   int                    last_height;
   int                    last_aspect_code;     /* used to detect changes for event sending */
-  
+
   unsigned int           dts_offset[3];
   int                    sync_every_frame;
   int                    sync_retry;
   int                    enhanced_mode;
   int                    resync_window;
   int                    skip_count;           /* syncing parameters */
-  
+
   int                    correct_durations;
   int64_t                last_vpts;
   int                    force_duration_window;
@@ -162,11 +162,11 @@
 static inline int dxr3_mvcommand(int fd_control, int command)
 {
   em8300_register_t reg;
-  
+
   reg.microcode_register = 1;
   reg.reg = 0;
   reg.val = command;
-  
+
   return ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg);
 }
 
@@ -174,19 +174,19 @@
 static void *dxr3_init_plugin(xine_t *xine, void *data)
 {
   dxr3_decoder_class_t *this;
-  
+
   this = calloc(1, sizeof (dxr3_decoder_class_t));
   if (!this) return NULL;
-  
+
   this->video_decoder_class.open_plugin     = dxr3_open_plugin;
[... 288 lines omitted ...]
 
@@ -600,10 +600,10 @@
 {
 }
 
-static void dxr3_flush(video_decoder_t *this_gen) 
+static void dxr3_flush(video_decoder_t *this_gen)
 {
   dxr3_decoder_t *this = (dxr3_decoder_t *)this_gen;
-  
+
   if (this->sequence_open && ++this->sequence_open > 5 &&
       _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_HAS_STILL)) {
     /* The dxr3 needs a sequence end code for still menus to work correctly
@@ -621,18 +621,18 @@
 {
   dxr3_decoder_t *this = (dxr3_decoder_t *)this_gen;
   metronom_clock_t *clock = this->class->clock;
-  
+
   if (this->scr)
     clock->unregister_scr(clock, &this->scr->scr_plugin);
-  
+
   dxr3_mvcommand(this->fd_control, MVCOMMAND_FLUSHBUF);
-  
+
   if (this->fd_video >= 0) close(this->fd_video);
   close(this->fd_control);
-  
+
   this->stream->video_out->close(this->stream->video_out, this->stream);
   this->class->instance  = 0;
-  
+
   free(this);
 }
 
@@ -646,11 +646,11 @@
   this->width           = ((this->height >> 12) + 15) & ~15;
   this->height          = ((this->height & 0xfff) + 15) & ~15;
   this->aspect_code     = buffer[3] >> 4;
-  
+
   this->have_header_info = 1;
-  
+
   if (this->force_aspect) this->aspect_code = this->force_aspect;
-  
+
   /* when width, height or aspect changes,
    * we have to send an event for dxr3 spu decoder */
   if (!this->last_width || !this->last_height || !this->last_aspect_code ||
@@ -667,7 +667,7 @@
 static int get_duration(dxr3_decoder_t *this)
 {
   int duration;
-  
+
   switch (this->frame_rate_code) {
   case 1: /* 23.976 */
     duration = 3754;  /* actually it's 3753.75 */
@@ -694,19 +694,19 @@
     duration = 1500;
     break;
   default:
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
 	    _("dxr3_decode_video: WARNING: unknown frame rate code %d\n"), this->frame_rate_code);
     duration = 0;
     break;
   }
-  
+
   /* update stream metadata */
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, duration);
-  
+
   if (this->correct_durations && duration) {
     /* we set an initial average frame duration here */
     if (!this->avg_duration) this->avg_duration = duration;
-  
+
     /* Apply a correction to the framerate-code if metronom
      * insists on a different frame duration.
      * The code below is for NTCS streams labeled as PAL streams.
@@ -731,7 +731,7 @@
         return 3000;
       }
     }
-    
+
     if (this->force_duration_window == -FORCE_DURATION_WINDOW_SIZE)
       /* we are far from a force_duration window */
       return duration;
@@ -744,7 +744,7 @@
       this->force_duration_window = -FORCE_DURATION_WINDOW_SIZE;
     }
   }
-  
+
   return duration;
 }
 
@@ -763,7 +763,7 @@
   data.aspect       = this->aspect_code;
   data.pan_scan     = this->force_pan_scan;
   xine_event_send(this->stream, &event);
-  
+
   /* update ratio */
   switch (this->aspect_code) {
   case 2:
@@ -779,12 +779,12 @@
     if (this->have_header_info)
       this->ratio = (double)this->width / (double)this->height;
   }
-  
+
   /* update stream metadata */
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,  this->width);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO,  10000 * this->ratio);
-  
+
   _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (DXR3)");
 }
 

diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -1,26 +1,26 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
+
 /* mpeg encoders for the dxr3 video out plugin.
  * supports the libfame and librte mpeg encoder libraries.
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -57,7 +57,7 @@
 #include <xine/xineutils.h>
 #include "video_out_dxr3.h"
 
-/* buffer size for encoded mpeg1 stream; will hold one intra frame 
+/* buffer size for encoded mpeg1 stream; will hold one intra frame
  * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */
 #define DEFAULT_BUFFER_SIZE 512*1024
 
@@ -73,7 +73,7 @@
 static int  rte_on_close(dxr3_driver_t *drv);
 
 /* helper function */
-static void mp1e_callback(rte_context *context, void *data, ssize_t size, 
+static void mp1e_callback(rte_context *context, void *data, ssize_t size,
                           void *user_data);
 
 /* encoder structure */
@@ -109,7 +109,7 @@
 } fame_data_t;
 
 /* helper function */
-static int fame_prepare_frame(fame_data_t *this, dxr3_driver_t *drv, 
+static int fame_prepare_frame(fame_data_t *this, dxr3_driver_t *drv,
                               dxr3_frame_t *frame);
 #endif
 
@@ -117,15 +117,15 @@
 int dxr3_rte_init(dxr3_driver_t *drv)
 {
   rte_data_t* this;
-  
+
   if (!rte_init()) {
     xprintf(drv->class->xine, XINE_VERBOSITY_LOG, _("dxr3_mpeg_encoder: failed to init librte\n"));
     return 0;
   }
-  
+
   this = calloc(1, sizeof(rte_data_t));
   if (!this) return 0;
-  
+
   this->encoder_data.type             = ENC_RTE;
   this->encoder_data.on_update_format = rte_on_update_format;
   this->encoder_data.on_frame_copy    = NULL;
@@ -133,7 +133,7 @@
   this->encoder_data.on_unneeded       = rte_on_unneeded;
   this->encoder_data.on_close         = rte_on_close;
   this->context                       = 0;
-  
+
   drv->enc = &this->encoder_data;
   return 1;
 }
@@ -141,7 +141,7 @@
 static int rte_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
 {
   rte_data_t *this = (rte_data_t *)drv->enc;
-  rte_context *context; 
+  rte_context *context;
   rte_codec *codec;
   double fps;
 
@@ -151,13 +151,13 @@
     rte_context_destroy(this->context);
     this->context = 0;
   }
-  
+
   if ((frame->vo_frame.pitches[0] % 16 != 0) || (frame->oheight % 16 != 0)) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_LOG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
 	    _("dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of 16\n"));
     return 0;
   }
-  
+
   this->width = frame->vo_frame.pitches[0];
   this->height = frame->oheight;
 
@@ -171,7 +171,7 @@
 #if LOG_ENC
   rte_set_verbosity(context, 2);
 #endif
-  
+
   /* get mpeg codec handle */
   codec = rte_codec_set(context, RTE_STREAM_VIDEO, 0, "mpeg1_video");
   if (!codec) {
@@ -180,26 +180,26 @@
[... 138 lines omitted ...]
   drv->enc = &this->encoder_data;
   return 1;
 }
 
-static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) 
+static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
 {
   fame_data_t *this = (fame_data_t *)drv->enc;
   fame_parameters_t init_fp = FAME_PARAMETERS_INITIALIZER;
   double fps;
 
-  av_freep(&this->buf);  
+  av_freep(&this->buf);
   this->out[0] = this->out[1] = this->out[2] = 0;
-  
+
   /* if YUY2 and dimensions changed, we need to re-allocate the
    * internal YV12 buffer */
   if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
     int image_size = frame->vo_frame.width * frame->oheight;
 
     this->out[0] = this->buf = av_mallocz(image_size * 3/2);
-    this->out[1] = this->out[0] + image_size; 
-    this->out[2] = this->out[1] + image_size/4; 
+    this->out[1] = this->out[0] + image_size;
+    this->out[2] = this->out[1] + image_size/4;
 
     /* fill with black (yuv 16,128,128) */
     memset(this->out[0], 16, image_size);
     memset(this->out[1], 128, image_size/4);
     memset(this->out[2], 128, image_size/4);
-    lprintf("Using YUY2->YV12 conversion\n");  
+    lprintf("Using YUY2->YV12 conversion\n");
   }
 
   if (this->context) {
@@ -360,18 +360,18 @@
     fame_close(this->context);
     this->context = 0;
   }
-  
+
   this->context = fame_open();
   if (!this->context) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_LOG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
 	    _("dxr3_mpeg_encoder: Couldn't start the FAME library\n"));
     return 0;
   }
-  
+
   if (!this->buffer)
     this->buffer = (unsigned char *)malloc(DEFAULT_BUFFER_SIZE);
   if (!this->buffer) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG,
 	    "dxr3_mpeg_encoder: Couldn't allocate temp buffer for mpeg data\n");
     return 0;
   }
@@ -403,23 +403,23 @@
   if (fps < 23.988) { /* NTSC-FILM */
     lprintf("setting mpeg output framerate to NTSC-FILM (23.976 Hz)\n");
     this->fp.frame_rate_num = 24000;
-    this->fp.frame_rate_den = 1001; 
+    this->fp.frame_rate_den = 1001;
   } else if (fps < 24.5) { /* FILM */
     lprintf("setting mpeg output framerate to FILM (24 Hz)\n");
     this->fp.frame_rate_num = 24;
-    this->fp.frame_rate_den = 1; 
+    this->fp.frame_rate_den = 1;
   } else if (fps < 27.485) { /* PAL */
     lprintf("setting mpeg output framerate to PAL (25 Hz)\n");
     this->fp.frame_rate_num = 25;
-    this->fp.frame_rate_den = 1; 
+    this->fp.frame_rate_den = 1;
   } else { /* NTSC */
     lprintf("setting mpeg output framerate to NTSC (29.97 Hz)\n");
     this->fp.frame_rate_num = 30000;
     this->fp.frame_rate_den = 1001;
   }
-  
+
   fame_init (this->context, &this->fp, this->buffer, DEFAULT_BUFFER_SIZE);
-  
+
   return 1;
 }
 
@@ -445,17 +445,17 @@
   size = fame_encode_frame(this->context, &this->yuv, NULL);
 #endif
 
-  frame->vo_frame.free(&frame->vo_frame); 
-  
+  frame->vo_frame.free(&frame->vo_frame);
+
   written = write(drv->fd_video, this->buffer, size);
   if (written < 0) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG,
 	    "dxr3_mpeg_encoder: video device write failed (%s)\n",
       strerror(errno));
     return 0;
   }
   if (written != size)
-    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG,
 	    "dxr3_mpeg_encoder: Could only write %d of %d mpeg bytes.\n",
       written, size);
   return 1;
@@ -464,7 +464,7 @@
 static int fame_on_unneeded(dxr3_driver_t *drv)
 {
   fame_data_t *this = (fame_data_t *)drv->enc;
-  
+
   if (this->context) {
     fame_close(this->context);
     this->context = 0;
@@ -491,7 +491,7 @@
   if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
     /* need YUY2->YV12 conversion */
     if (!(this->out[0] && this->out[1] && this->out[2]) ) {
-      xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(drv->class->xine, XINE_VERBOSITY_DEBUG,
 	      "dxr3_mpeg_encoder: Internal YV12 buffer not created.\n");
       return 0;
     }

diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c
--- a/src/dxr3/dxr3_scr.c
+++ b/src/dxr3/dxr3_scr.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -55,11 +55,11 @@
 static inline int dxr3_mvcommand(int fd_control, int command)
 {
   em8300_register_t reg;
-  
+
   reg.microcode_register = 1;
   reg.reg = 0;
   reg.val = command;
-  
+
   return ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg);
 }
 
@@ -69,21 +69,21 @@
   dxr3_scr_t *this;
   int devnum;
   char tmpstr[128];
-  
+
   this = calloc(1, sizeof(dxr3_scr_t));
-  
+
   devnum = xine->config->register_num(xine->config,
     CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL);
   snprintf(tmpstr, sizeof(tmpstr), "/dev/em8300-%d", devnum);
   if ((this->fd_control = open(tmpstr, O_WRONLY)) < 0) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "dxr3_scr: Failed to open control device %s (%s)\n", tmpstr, strerror(errno));
     free(this);
     return NULL;
   }
-  
+
   this->xine = xine;
-  
+
   this->scr_plugin.interface_version = 3;
   this->scr_plugin.get_priority      = dxr3_scr_get_priority;
   this->scr_plugin.start             = dxr3_scr_start;
@@ -91,7 +91,7 @@
   this->scr_plugin.adjust            = dxr3_scr_adjust;
   this->scr_plugin.set_fine_speed    = dxr3_scr_set_speed;
   this->scr_plugin.exit              = dxr3_scr_exit;
-  
+
   this->priority                     = xine->config->register_num(
     xine->config, "dxr3.scr_priority", 10, _("SCR plugin priority"),
     _("Priority of the DXR3 SCR plugin. Values less than 5 mean that the "
@@ -102,9 +102,9 @@
   this->last_pts                     = 0;
   this->scanning                     = 0;
   this->sync                         = 0;
-  
+
   pthread_mutex_init(&this->mutex, NULL);
-  
+
   lprintf("init complete\n");
   return this;
 }
@@ -120,7 +120,7 @@
 {
   dxr3_scr_t *this = (dxr3_scr_t *)scr;
   uint32_t vpts32 = vpts >> 1;
-  
+
   pthread_mutex_lock(&this->mutex);
   this->last_pts = vpts32;
   this->offset = vpts - ((int64_t)vpts32 << 1);
@@ -140,7 +140,7 @@
   dxr3_scr_t *this = (dxr3_scr_t *)scr;
   uint32_t pts;
   int64_t current;
-  
+
   pthread_mutex_lock(&this->mutex);
   if (ioctl(this->fd_control, EM8300_IOCTL_SCR_GET, &pts))
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, "dxr3_scr: get current failed (%s)\n", strerror(errno));
@@ -152,7 +152,7 @@
   this->last_pts = pts;
   current = ((int64_t)pts << 1) + this->offset;
   pthread_mutex_unlock(&this->mutex);
-  
+
   return current;
 }
 
@@ -161,7 +161,7 @@
   dxr3_scr_t *this = (dxr3_scr_t *)scr;
   uint32_t current_pts32;
   int32_t offset32;
- 
+
   pthread_mutex_lock(&this->mutex);
   if (ioctl(this->fd_control, EM8300_IOCTL_SCR_GET, &current_pts32))
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, "dxr3_scr: adjust get failed (%s)\n", strerror(errno));
@@ -187,7 +187,7 @@
   int playmode;
 
   pthread_mutex_lock(&this->mutex);
-  
+
   em_speed = 0x900LL * (int64_t)speed / XINE_FINE_SPEED_NORMAL;
   switch (em_speed) {
   case 0:
@@ -200,24 +200,24 @@
       playmode = MVCOMMAND_SYNC;
     else
       playmode = MVCOMMAND_START;
-    break;    
+    break;
   default:
     playmode = MVCOMMAND_START;
   }
-  
+
   if (dxr3_mvcommand(this->fd_control, playmode))
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, "dxr3_scr: failed to playmode (%s)\n", strerror(errno));
-  
+
   if(em_speed > 0x900)
     this->scanning = 1;
   else
     this->scanning = 0;
-  
+
   if (ioctl(this->fd_control, EM8300_IOCTL_SCR_SETSPEED, &em_speed))
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, "dxr3_scr: failed to set speed (%s)\n", strerror(errno));
-  
+
   pthread_mutex_unlock(&this->mutex);
-  
+
   lprintf("speed set to mode %d\n", speed);
   return speed;
 }
@@ -225,7 +225,7 @@
 static void dxr3_scr_exit(scr_plugin_t *scr)
 {
   dxr3_scr_t *this = (dxr3_scr_t *)scr;
-  
+
   close(this->fd_control);
   pthread_mutex_destroy(&this->mutex);
   free(this);
@@ -237,8 +237,8 @@
 static void dxr3_scr_update_priority(void *this_gen, xine_cfg_entry_t *entry)
 {
   dxr3_scr_t *this = (dxr3_scr_t *)this_gen;
-  
+
   this->priority = entry->num_value;
-  xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	  "dxr3_scr: setting scr priority to %d\n", entry->num_value);
 }
diff --git a/src/dxr3/dxr3_scr.h b/src/dxr3/dxr3_scr.h
--- a/src/dxr3/dxr3_scr.h
+++ b/src/dxr3/dxr3_scr.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -25,11 +25,11 @@
 typedef struct dxr3_scr_s {
   scr_plugin_t    scr_plugin;
   pthread_mutex_t mutex;
-  
+
   xine_t         *xine;
-  
+
   int             fd_control; /* to access the dxr3 control device */
-  
+
   int             priority;
   int64_t         offset;     /* difference between real scr and internal dxr3 clock */
   uint32_t        last_pts;   /* last known value of internal dxr3 clock to detect wrap around */
diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c
--- a/src/dxr3/dxr3_spu_encoder.c
+++ b/src/dxr3/dxr3_spu_encoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -68,7 +68,7 @@
 spu_encoder_t *dxr3_spu_encoder_init(void)
 {
   spu_encoder_t *this;
-  
+
   this = (spu_encoder_t *)malloc(sizeof(spu_encoder_t));
   this->target        = NULL;
   this->need_reencode = 0;
@@ -94,7 +94,7 @@
 static void convert_palette(spu_encoder_t *this)
 {
   int i, y, cb, cr, r, g, b;
-  
+
   if (!this->overlay->rgb_clut) {
     for (i = 0; i < OVL_PALETTE_SIZE; i++) {
       y  = (this->overlay->color[i] >> 16) & 0xff;
@@ -137,7 +137,7 @@
 {
   rle_elem_t *rle;
   int i, x, y, len, part;
-  
+
   for (i = 0; i < OVL_PALETTE_SIZE; i++)
     this->map[i] = this->clip_map[i] = 0;
   x = y = 0;
@@ -180,14 +180,14 @@
 {
   int i, max, spu_color;
   double dist, diff;
-  
+
   /* find first maximum -> first spu color */
   max = 0;
   for (i = 1; i < OVL_PALETTE_SIZE; i++)
     if (this->map[i] > this->map[max]) max = i;
   this->color[0] = this->overlay->color[max];
   this->trans[0] = this->overlay->trans[max];
-  
+
   for (spu_color = 1; spu_color < 4; spu_color++) {
     /* modify histogram and find next maximum -> next spu color */
     max = 0;
@@ -221,7 +221,7 @@
     if (this->clip_map[i] > this->clip_map[max]) max = i;
   this->hili_color[0] = this->overlay->hili_color[max];
   this->hili_trans[0] = this->overlay->hili_trans[max];
-  
+
   for (spu_color = 1; spu_color < 4; spu_color++) {
     /* modify histogram and find next maximum -> next spu color */
     max = 0;
@@ -252,7 +252,7 @@
 {
   int i, min, spu_color;
   double dist, diff, min_dist;
-  
+
   /* for all colors in overlay palette find closest spu color */
   for (i = 0; i < OVL_PALETTE_SIZE; i++) {
     min = 0;
@@ -299,7 +299,7 @@
 static void convert_clut(spu_encoder_t *this)
 {
   int i, r, g, b, y, cb, cr;
-  
+
   for (i = 0; i < 4; i++) {
     r  = (this->color[i] >> 16) & 0xff;
     g  = (this->color[i] >>  8) & 0xff;
@@ -311,7 +311,7 @@
   }
   for (i = 4; i < 16; i++)
     this->color[i] = 0x00008080;
-  
+
   for (i = 0; i < 4; i++) {
     r  = (this->hili_color[i] >> 16) & 0xff;
     g  = (this->hili_color[i] >>  8) & 0xff;
@@ -330,15 +330,15 @@
   int offset = 0, field_start[2];
   rle_elem_t *rle;
   int field, i, len, part, x, y, higher_nibble = 1;
-  
+
   /* size will be determined later */
   write_byte(this, &offset, 0x00);
   write_byte(this, &offset, 0x00);
-  
+
   /* control sequence pointer will be determined later */
   write_byte(this, &offset, 0x00);
   write_byte(this, &offset, 0x00);
-  
+
   for (field = 0; field < 2; field++) {
     write_byte(this, &offset, 0x00);
     write_byte(this, &offset, 0x00);
@@ -373,10 +373,10 @@
       }
     }
   }
-  
+
   /* we should be byte aligned here */
   _x_assert(higher_nibble);
-  
+
   /* control sequence starts here */
   this->target[2] = offset >> 8;
   this->target[3] = offset & 0xff;
diff --git a/src/dxr3/em8300.h b/src/dxr3/em8300.h
--- a/src/dxr3/em8300.h
+++ b/src/dxr3/em8300.h
@@ -186,7 +186,7 @@
 #define IRQSTATUS_AUDIO_FIFO 0x8
 
 #define ENCODER_UNKNOWN 0
-#define ENCODER_ADV7175 1 
+#define ENCODER_ADV7175 1
 #define ENCODER_ADV7170 2
 #define ENCODER_BT865   3
 
@@ -235,21 +235,21 @@
 struct em8300_s
 {
 	char name[40];
-	
+
 	int chip_revision;
 	int pci_revision;
-	
+
 	int inuse[4];
 	int nonblock[4];
 	int ucodeloaded;
-	
+
 	struct pci_dev *dev;
 	ulong adr;
 	volatile unsigned *mem;
 	ulong memsize;
-	
+
 	int playmode;
-	
+
 	/* Sysfs */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,46)
 	struct class_device classdev;
@@ -263,7 +263,7 @@
 	struct fifo_s *mafifo;
 	struct fifo_s *spfifo;
 	int mtrr_reg;
-	
+
 	/* DICOM */
 	int dicom_vertoffset;
 	int dicom_horizoffset;
@@ -272,47 +272,47 @@
 	int dicom_saturation;
 	int dicom_tvout;
 	struct displaybuffer_info_s dbuf_info;
-	
+
 	/* I2C */
 	int i2c_pin_reg;
 	int i2c_oe_reg;
-	
+
 	/* different between revision 1 and revision 2 boards */
 	int mystery_divisor;
-	
+
 	/* I2C bus 1*/
 	struct i2c_algo_bit_data i2c_data_1;
 	struct i2c_adapter i2c_ops_1;
-	
+
 	/* I2C bus 2*/
 	struct i2c_algo_bit_data i2c_data_2;
 	struct i2c_adapter i2c_ops_2;
-	
+
 	/* I2C clients */
 	int encoder_type;
 	struct i2c_client *encoder;
-	
+
 	/* Microcode registers */
 	unsigned ucode_regs[MAX_UCODE_REGISTER];
 	int var_ucode_reg1; /* These are registers that differ */
 	int var_ucode_reg2; /* between versions 1 and 2 of the board */
 	int var_ucode_reg3; /* " */
-	
+
 	/* Interrupt */
 	unsigned irqmask;
-	
+
 	/* Clockgenerator */
 	int clockgen;
 	int clockgen_overlaymode;
 	int clockgen_tvmode;
-	
+
 	/* Timing measurement */
 	struct timeval tv, last_status_time;
 	long irqtimediff;
 	int irqcount;
 	int frames;
 	int scr;
-	
+
 	/* Audio */
 	struct em8300_audio_s audio;
 	int audio_mode;
@@ -321,7 +321,7 @@
 /* */
 	int dword_DB4;
 	unsigned char byte_D90[24];
-	
+
 	/* Video */
 	int video_mode;
 	int video_playmode;
@@ -330,7 +330,7 @@
 	uint32_t video_lastpts;
 	int video_ptsvalid,video_offset,video_count;
 	int video_ptsfifo_ptr;
-#if LINUX_VERSION_CODE < 0x020314    
+#if LINUX_VERSION_CODE < 0x020314
 	struct wait_queue *video_ptsfifo_wait;
 	struct wait_queue *vbi_wait;
 #else
@@ -340,20 +340,20 @@
 	int video_ptsfifo_waiting;
 	int video_first;
 	int var_video_value;
-	
+
 	/* Sub Picture */
 	int sp_pts, sp_ptsvalid, sp_count;
 	int sp_ptsfifo_ptr;
-#if LINUX_VERSION_CODE < 0x020314    
+#if LINUX_VERSION_CODE < 0x020314
 	struct wait_queue *sp_ptsfifo_wait;
 #else
 	wait_queue_head_t sp_ptsfifo_wait;
 #endif
 	int sp_ptsfifo_waiting;
 	int sp_mode;
-	
+
 	int linecounter;
-	
+
 	/* EM9010 overlay processor */
 	int overlay_enabled;
 	int overlay_mode;
@@ -373,7 +373,7 @@
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,0)
 	/* Memory exported via mmap() */
 	struct list_head  memory;
-#endif	
+#endif
 
 	/* To support different options for different cards */
 	unsigned int card_nr;
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -1,23 +1,23 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
+
 /* mpeg encoders for the dxr3 video out plugin. */
 
 #ifdef HAVE_CONFIG_H
@@ -44,7 +44,7 @@
 #  include <libavcodec/avcodec.h>
 #endif
 
-/* buffer size for encoded mpeg1 stream; will hold one intra frame 
+/* buffer size for encoded mpeg1 stream; will hold one intra frame
  * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */
 #define DEFAULT_BUFFER_SIZE 512*1024
 
@@ -79,7 +79,7 @@
   lavc_data_t* this;
   avcodec_init();
 
-  avcodec_register_all();  
+  avcodec_register_all();
   lprintf("lavc init , version %x\n", avcodec_version());
   this = calloc(1, sizeof(lavc_data_t));
   if (!this) return 0;
@@ -90,7 +90,7 @@
   this->encoder_data.on_display_frame = lavc_on_display_frame;
   this->encoder_data.on_unneeded      = lavc_on_unneeded;
   this->context                       = 0;
-  
+
   drv->enc = &this->encoder_data;
   drv->enc->on_close = dxr3_lavc_close;
   return 1;
@@ -104,7 +104,7 @@
   lavc_data_t *this = (lavc_data_t *)drv->enc;
   AVCodec *codec;
   unsigned char use_quantizer;
-  
+
   if (this->context) {
     avcodec_close(this->context);
     free(this->context);
@@ -112,26 +112,26 @@
     this->context = NULL;
     this->picture = NULL;
   }
-  
+
   /* if YUY2 and dimensions changed, we need to re-allocate the
    * internal YV12 buffer */
   if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
     int image_size = frame->vo_frame.pitches[0] * frame->oheight;
 
     this->out[0] = this->buf = av_mallocz(image_size * 3/2);
-    this->out[1] = this->out[0] + image_size; 
-    this->out[2] = this->out[1] + image_size/4; 
+    this->out[1] = this->out[0] + image_size;
+    this->out[2] = this->out[1] + image_size/4;
 
     /* fill with black (yuv 16,128,128) */
     memset(this->out[0], 16, image_size);
     memset(this->out[1], 128, image_size/4);
     memset(this->out[2], 128, image_size/4);
-    lprintf("Using YUY2->YV12 conversion\n");  
+    lprintf("Using YUY2->YV12 conversion\n");
   }
-  
+
   /* resolution must be a multiple of two */
   if ((frame->vo_frame.pitches[0] % 2 != 0) || (frame->oheight % 2 != 0)) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_LOG, 
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
       "dxr3_mpeg_encoder: lavc only handles video dimensions which are multiples of 2\n");
     return 0;
   }
@@ -153,7 +153,7 @@
     xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
       "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
     return 0;
-  } 
+  }
   this->picture = avcodec_alloc_frame();
   if (!this->picture) {
     xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
@@ -163,7 +163,7 @@
 
   /* mpeg1 encoder only support YUV420P */
   this->context->pix_fmt = PIX_FMT_YUVJ420P;
-  
+
   /* put sample parameters */
   this->context->bit_rate = drv->class->xine->config->register_range(drv->class->xine->config,
     "dxr3.encoding.lavc_bitrate", 10000, 1000, 20000,
@@ -172,7 +172,7 @@
       "Higher values will increase quality and CPU usage.\n"
       "This setting is only considered, when constant quality mode is disabled."), 10, NULL, NULL);
     this->context->bit_rate *= 1000; /* config in kbit/s, libavcodec wants bit/s */
-    
+
   use_quantizer = drv->class->xine->config->register_bool(drv->class->xine->config,
     "dxr3.encoding.lavc_quantizer", 1,
     _("constant quality mode"),
@@ -180,18 +180,18 @@
       "compressing the images based on their complexity. When disabled, libavcodec "
       "will use constant bitrate mode."), 10, NULL, NULL);
 
-  if (use_quantizer) {        
+  if (use_quantizer) {
     this->context->qmin = drv->class->xine->config->register_range(drv->class->xine->config,
     "dxr3.encoding.lavc_qmin", 1, 1, 10,
     _("minimum compression"),
     _("The minimum compression to apply to an image in constant quality mode."),
     10, NULL, NULL);
-     
+
     this->context->qmax = drv->class->xine->config->register_range(drv->class->xine->config,
     "dxr3.encoding.lavc_qmax", 2, 1, 20,
     _("maximum quantizer"),
     _("The maximum compression to apply to an image in constant quality mode."),
-    10, NULL, NULL);  
+    10, NULL, NULL);
   }
 
   lprintf("lavc -> bitrate %d  \n", this->context->bit_rate);
@@ -201,7 +201,7 @@
 
   this->context->gop_size = 0; /*intra frames only */
   this->context->me_method = ME_ZERO; /*motion estimation type*/
-  
+
   this->context->time_base.den = 90000;
   if (frame->vo_frame.duration > 90000 / 24)
     this->context->time_base.num = 90000 / 24;
@@ -212,14 +212,14 @@
   /* ffmpeg can complain about illegal framerates, but since this seems no
    * problem for the DXR3, we just tell ffmpeg to be more lax with */
   this->context->strict_std_compliance = -1;
-  
+
   /* open avcodec */
   if (avcodec_open(this->context, codec) < 0) {
     xprintf(drv->class->xine, XINE_VERBOSITY_LOG, "dxr3_mpeg_encoder: could not open codec\n");
     return 0;
   }
   lprintf("dxr3_mpeg_encoder: lavc MPEG1 codec opened.\n");
-  
+
   if (!this->ffmpeg_buffer)
     this->ffmpeg_buffer = (unsigned char *)malloc(DEFAULT_BUFFER_SIZE); /* why allocate more than needed ?! */
   if (!this->ffmpeg_buffer) {
@@ -236,7 +236,7 @@
   int size;
   lavc_data_t* this = (lavc_data_t *)drv->enc;
   ssize_t written;
-	
+
   if (frame->vo_frame.bad_frame) return 1;
     /* ignore old frames */
   if ((frame->vo_frame.pitches[0] != this->context->width) || (frame->oheight != this->context->height)) {
@@ -289,7 +289,7 @@
 {
   int i, j, w2;
   uint8_t *yuy2;
-	
+
   if (frame->vo_frame.bad_frame) return 1;
 
   if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
@@ -325,7 +325,7 @@
     this->picture->data[1] = this->out[1];
     this->picture->data[2] = this->out[2];
   }
-  else { /* YV12 **/  
+  else { /* YV12 **/
 	this->picture->data[0] = frame->real_base[0];
     this->picture->data[1] = frame->real_base[1];
     this->picture->data[2] = frame->real_base[2];
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -1,28 +1,28 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
-/* mpeg1 encoding video out plugin for the dxr3.  
+
+/* mpeg1 encoding video out plugin for the dxr3.
  *
- * modifications to the original dxr3 video out plugin by 
+ * modifications to the original dxr3 video out plugin by
  * Mike Lampard <mlampard at users.sourceforge.net>
- * this first standalone version by 
+ * this first standalone version by
  * Harm van der Heijden <hrm at users.sourceforge.net>
  */
 
@@ -96,7 +96,7 @@
 };
 
 const plugin_info_t      xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
 #ifdef HAVE_X11
   { PLUGIN_VIDEO_OUT, 22, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin },
 #endif
@@ -153,7 +153,7 @@
 static void *dxr3_x11_init_plugin(xine_t *xine, void *visual_gen)
 {
   dxr3_driver_class_t *this = dxr3_vo_init_plugin(xine, visual_gen);
-  
+
   if (!this) return NULL;
   this->visual_type = XINE_VISUAL_TYPE_X11;
   return &this->video_driver_class;
@@ -163,7 +163,7 @@
 static void *dxr3_aa_init_plugin(xine_t *xine, void *visual_gen)
 {
   dxr3_driver_class_t *this = dxr3_vo_init_plugin(xine, visual_gen);
-  
+
   if (!this) return NULL;
   this->visual_type = XINE_VISUAL_TYPE_AA;
   return &this->video_driver_class;
@@ -172,10 +172,10 @@
 static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen)
 {
   dxr3_driver_class_t *this;
-  
+
   this = calloc(1, sizeof(dxr3_driver_class_t));
   if (!this) return NULL;
-  
+
   this->devnum = xine->config->register_num(xine->config,
     CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL);
 
@@ -183,20 +183,20 @@
   this->video_driver_class.identifier      = DXR3_VO_ID;
   this->video_driver_class.description     = N_("video output plugin displaying images through your DXR3 decoder card");
   this->video_driver_class.dispose         = dxr3_vo_class_dispose;
-  
+
   this->xine                               = xine;
-  
+
   this->instance                           = 0;
-  
+
   this->scr                                = dxr3_scr_init(xine);
-  
+
   return this;
 }
 
 static void dxr3_vo_class_dispose(video_driver_class_t *class_gen)
 {
   dxr3_driver_class_t *class = (dxr3_driver_class_t *)class_gen;
-  
+
   if(class->scr)
     class->scr->scr_plugin.exit(&class->scr->scr_plugin);
   free(class_gen);
@@ -224,12 +224,12 @@
   static const char *const tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL };
   int list_id, list_size;
   xine_sarray_t *plugin_list;
-  
+
   if (class->instance) return NULL;
-  
+
   this = calloc(1, sizeof(dxr3_driver_t));
   if (!this) return NULL;
-  
+
   this->vo_driver.get_capabilities     = dxr3_get_capabilities;
   this->vo_driver.alloc_frame          = dxr3_alloc_frame;
   this->vo_driver.update_frame_format  = dxr3_update_frame_format;
@@ -243,13 +243,13 @@
   this->vo_driver.get_property_min_max = dxr3_get_property_min_max;
   this->vo_driver.gui_data_exchange    = dxr3_gui_data_exchange;
   this->vo_driver.dispose              = dxr3_dispose;
-  
[... 705 lines omitted ...]
   attr.attribute = EM9010_ATTRIBUTE_KEYCOLOR_UPPER;
   attr.value     = overlay_limit;
   if ((ret = ioctl(this->fd_control, EM8300_IOCTL_OVERLAY_SET_ATTRIBUTE, &attr)) < 0)
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_dxr3: WARNING: error setting overlay upper limit attribute\n");
   return ret;
 }
@@ -1437,7 +1437,7 @@
 static int dxr3_overlay_set_attributes(dxr3_overlay_t *this)
 {
   em8300_attribute_t attr;
-  
+
   attr.attribute = EM9010_ATTRIBUTE_XOFFSET;
   attr.value     = this->xoffset;
   if(ioctl(this->fd_control, EM8300_IOCTL_OVERLAY_SET_ATTRIBUTE, &attr) == -1)
@@ -1464,9 +1464,9 @@
 {
   if (_x_vo_scale_redraw_needed(&this->scale)) {
     em8300_overlay_window_t win;
-    
+
     _x_vo_scale_compute_output_size(&this->scale);
-    
+
     /* fill video window with keycolor */
     XLockDisplay(this->display);
     XSetForeground(this->display, this->gc, this->black.pixel);
@@ -1479,24 +1479,24 @@
       this->scale.output_width, this->scale.output_height - 2 * this->overlay.shrink);
     XFlush(this->display);
     XUnlockDisplay(this->display);
-    
+
     win.xpos   = this->scale.output_xoffset + this->scale.gui_win_x;
     win.ypos   = this->scale.output_yoffset + this->scale.gui_win_y;
     win.width  = this->scale.output_width;
     win.height = this->scale.output_height;
-    
+
     if (this->pan_scan) {
       win.xpos  -= win.width / 6;
       win.width *= 4;
       win.width /= 3;
     }
-    
+
     /* is some part of the picture visible? */
     if (win.xpos + win.width  < 0) return;
     if (win.ypos + win.height < 0) return;
     if (win.xpos > this->overlay.screen_xres) return;
     if (win.ypos > this->overlay.screen_yres) return;
-  
+
     ioctl(this->fd_control, EM8300_IOCTL_OVERLAY_SETWINDOW, &win);
   }
 }
@@ -1505,20 +1505,20 @@
 static void dxr3_zoomTV(dxr3_driver_t *this)
 {
   em8300_register_t frame, visible, update;
-  
+
   /* change left bound */
   frame.microcode_register   = 1;
   frame.reg                  = 93;   // dicom frame left
   frame.val                  = 0x10;
-  
+
   visible.microcode_register = 1;
   visible.reg                = 97;   // dicom visible left
   visible.val                = 0x10;
-  
+
   update.microcode_register  = 1;
   update.reg                 = 65;   // dicom_update
   update.val                 = 1;
-      
+
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &frame);
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &visible);
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &update);
@@ -1527,15 +1527,15 @@
   frame.microcode_register   = 1;
   frame.reg                  = 94;   // dicom frame right
   frame.val                  = 0x10;
-  
+
   visible.microcode_register = 1;
   visible.reg                = 98;   // dicom visible right
   visible.val                = 968;
-  
+
   update.microcode_register  = 1;
   update.reg                 = 65;   // dicom_update
   update.val                 = 1;
-      
+
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &frame);
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &visible);
   ioctl(this->fd_control, EM8300_IOCTL_WRITEREG, &update);
@@ -1546,7 +1546,7 @@
 {
   dxr3_driver_t *this = (dxr3_driver_t *)data;
   this->add_bars = entry->num_value;
-  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 	  "video_out_dxr3: setting add_bars to correct aspect ratio to %s\n", (this->add_bars ? "on" : "off"));
 }
 
@@ -1554,7 +1554,7 @@
 {
   dxr3_driver_t *this = (dxr3_driver_t *)data;
   this->swap_fields = entry->num_value;
-  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 	  "video_out_dxr3: setting swap fields to %s\n", (this->swap_fields ? "on" : "off"));
 }
 
@@ -1562,6 +1562,6 @@
 {
   dxr3_driver_t *this = (dxr3_driver_t *)data;
   this->enhanced_mode = entry->num_value;
-  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 	  "video_out_dxr3: setting enhanced encoding playback to %s\n", (this->enhanced_mode ? "on" : "off"));
 }

diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h
--- a/src/dxr3/video_out_dxr3.h
+++ b/src/dxr3/video_out_dxr3.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2001 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -48,7 +48,7 @@
 
 typedef struct dxr3_overlay_s {
   xine_t          *xine;
-  
+
   int              fd_control;
 
   int              xoffset;
@@ -70,12 +70,12 @@
 typedef struct dxr3_driver_class_s {
   video_driver_class_t  video_driver_class;
   xine_t               *xine;
-  
+
   int                   visual_type;
   int                   instance;           /* we allow only one instance of this plugin */
-  
+
   int                   devnum;
-  
+
   dxr3_scr_t           *scr;                /* to provide dxr3 clocking */
 } dxr3_driver_class_t;
 
@@ -89,11 +89,11 @@
   pthread_mutex_t      spu_device_lock;
   int                  fd_spu;              /* to access the relevant dxr3 devices */
   int                  clut_cluttered;      /* to tell spu decoder that it has to restore the palette */
-  
+
   int                  enhanced_mode;
   int                  swap_fields;         /* swap fields */
   int                  add_bars;            /* add black bars to correct a.r. */
-  
+
   int                  aspect;
   int                  tv_mode;
   int                  pan_scan;
@@ -105,14 +105,14 @@
   encoder_data_t      *enc;                 /* mpeg encoder data */
   spu_encoder_t       *spu_enc;             /* spu encoder */
   int                  need_update;         /* the mpeg encoder needs to be updated */
-  
+
   uint32_t             video_iheight;       /* input height (before adding black bars) */
   uint32_t             video_oheight;       /* output height (after adding black bars) */
   uint32_t             video_width;
   double               video_ratio;
   int                  video_aspect;
   int                  top_bar;             /* the height of the upper black bar */
-  
+
   vo_scale_t           scale;
   alphablend_t         alphablend_extra_data;
 
@@ -143,10 +143,10 @@
   int            (*on_display_frame)(dxr3_driver_t *, dxr3_frame_t *);
   int            (*on_unneeded)(dxr3_driver_t *);
   int            (*on_close)(dxr3_driver_t *);
-  
+
   /* this is only used by the libavcodec encoder */
   void            *handle;
-}; 
+};
 
 struct spu_encoder_s {
   vo_overlay_t   *overlay;
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -65,11 +65,11 @@
   *password = NULL;
   *uri      = NULL;
 
-  /* proto */  
+  /* proto */
   start = strstr(url, "://");
   if (!start || (start == url))
     goto error;
-  
+
   end  = start + strlen(start) - 1;
   *proto = strndup(url, start - url);
 
@@ -85,10 +85,10 @@
   semicolon = strchr(start, ';');
   if (semicolon && (!slash || (semicolon < slash)))
     slash = semicolon;
-  
+
   if (at && slash && (at > slash))
     at = NULL;
-  
+
   if (at) {
     authcolon = strchr(start, ':');
     if(authcolon && authcolon < at) {
@@ -179,7 +179,7 @@
 	  escapechars++;
 	it++;
       }
-      
+
       if ( escapechars == 0 )
 	*uri = strdup(start);
       else {
@@ -204,9 +204,9 @@
   } else {
     *uri = strdup("/");
   }
-  
+
   return 1;
-  
+
 error:
   if (*proto) {
     free (*proto);
@@ -231,7 +231,7 @@
     free (*uri);
     *uri = NULL;
   }
-  return 0;  
+  return 0;
 }
 
 
@@ -244,7 +244,7 @@
   char *proto, *host, *user, *password, *uri;
   int port;
   int res;
-  
+
   printf("--------------------------------\n");
   printf("url=%s\n", url);
   res = _x_parse_url (url,
@@ -287,7 +287,7 @@
 int main(int argc, char** argv) {
   char *proto, host, port, user, password, uri;
   int res = 0;
-  
+
   res += check_url("http://www.toto.com/test1.asx", 1);
   res += check_url("http://www.toto.com:8080/test2.asx", 1);
   res += check_url("http://titi:pass@...>", 1);
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * Compact Disc Digital Audio (CDDA) Input Plugin 
+ * Compact Disc Digital Audio (CDDA) Input Plugin
  *   by Mike Melanson (melanson@...)
  */
 
@@ -140,7 +140,7 @@
     int                enabled;
     char              *server;
     int                port;
-    
+
     char              *cdiscid;
     char              *disc_title;
     char              *disc_year;
@@ -188,7 +188,7 @@
 
   char                *cdda_device;
   int                  cddb_error;
-  
+
   cdda_input_plugin_t *ip;
 
   int                  show_hidden_files;
@@ -196,7 +196,7 @@
 
   int                  mrls_allocated_entries;
   xine_mrl_t         **mrls;
-  
+
   char                *autoplaylist[MAX_TRACKS];
 
 } cdda_input_class_t;
@@ -328,54 +328,54 @@
 
 #ifdef LOG
 static void print_cdrom_toc(cdrom_toc *toc) {
-  
+
   int i;
   int time1;
   int time2;
   int timediff;
-  
+
   printf("\ntoc:\n");
   printf("\tfirst track  = %d\n", toc->first_track);
   printf("\tlast track   = %d\n", toc->last_track);
   printf("\ttotal tracks = %d\n", toc->total_tracks);
   printf("\ntoc entries:\n");
-  
-  
+
+
   printf("leadout track: Control: %d MSF: %02d:%02d:%04d, first frame = %d\n",
 	 toc->leadout_track.track_mode,
 	 toc->leadout_track.first_frame_minute,
 	 toc->leadout_track.first_frame_second,
 	 toc->leadout_track.first_frame_frame,
 	 toc->leadout_track.first_frame);
-  
+
   /* fetch each toc entry */
-  if (toc->first_track > 0) {		
-    for (i = toc->first_track; i <= toc->last_track; i++) {			
+  if (toc->first_track > 0) {
+    for (i = toc->first_track; i <= toc->last_track; i++) {
       printf("\ttrack mode = %d", toc->toc_entries[i-1].track_mode);
-      printf("\ttrack %d, audio, MSF: %02d:%02d:%02d, first frame = %d\n",  
-	     i, 
+      printf("\ttrack %d, audio, MSF: %02d:%02d:%02d, first frame = %d\n",
+	     i,
 	     toc->toc_entries[i-1].first_frame_minute,
 	     toc->toc_entries[i-1].first_frame_second,
 	     toc->toc_entries[i-1].first_frame_frame,
 	     toc->toc_entries[i-1].first_frame);
-      
-      time1 = ((toc->toc_entries[i-1].first_frame_minute * 60) + 
+
+      time1 = ((toc->toc_entries[i-1].first_frame_minute * 60) +
 	       toc->toc_entries[i-1].first_frame_second);
-      
+
       if (i == toc->last_track) {
 	time2 = ((toc->leadout_track.first_frame_minute * 60) +
 		 toc->leadout_track.first_frame_second);
       }
       else {
-	time2 = ((toc->toc_entries[i].first_frame_minute * 60) + 
+	time2 = ((toc->toc_entries[i].first_frame_minute * 60) +
 		 toc->toc_entries[i].first_frame_second);
       }
-      
+
       timediff = time2 - time1;
-      
+
       printf("\t time: %02d:%02d\n", timediff/60, timediff%60);
     }
-  }	
+  }
 }
 #endif
 
@@ -429,7 +429,7 @@
     toc->ignore_last_track = 0;
   }
   toc->total_tracks = toc->last_track - toc->first_track + 1;
-  
+
   /* allocate space for the toc entries */
   toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
   if (!toc->toc_entries) {
@@ -800,7 +800,7 @@
       return -1;
     }
 #endif
-    
+
     data += CD_RAW_FRAME_SIZE;
     frame++;
     num_frames--;
[... 764 lines omitted ...]
-static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, 
+static char ** cdda_class_get_autoplay_list (input_class_t *this_gen,
 					    int *num_files) {
 
   cdda_input_class_t *this = (cdda_input_class_t *) this_gen;
@@ -2437,8 +2437,8 @@
   /* free old playlist */
   for( i = 0; this->autoplaylist[i]; i++ ) {
     free( this->autoplaylist[i] );
-    this->autoplaylist[i] = NULL; 
-  }  
+    this->autoplaylist[i] = NULL;
+  }
 
   /* get the CD TOC */
   toc = init_cdrom_toc();
@@ -2484,13 +2484,13 @@
   print_cdrom_toc(toc);
 #endif
 
-  cdda_close(ip);  
-  
+  cdda_close(ip);
+
   if ( err < 0 ) {
     if (ip != this->ip) free(ip);
     return NULL;
   }
-  
+
   num_tracks = toc->last_track - toc->first_track;
   if (toc->ignore_last_track)
     num_tracks--;
@@ -2550,19 +2550,19 @@
     return NULL;
 
   this = calloc(1, sizeof (cdda_input_plugin_t));
-  
+
   class->ip = this;
   this->stream      = stream;
   this->mrl         = strdup(mrl);
   this->cdda_device = cdda_device;
-  
+
   /* CD tracks start from 1; internal data structure indexes from 0 */
   this->track      = track - 1;
   this->cddb.track = NULL;
   this->fd         = -1;
   this->net_fd     = -1;
   this->class      = (input_class_t *) class;
-  
+
   this->input_plugin.open               = cdda_plugin_open;
   this->input_plugin.get_capabilities   = cdda_plugin_get_capabilities;
   this->input_plugin.read               = cdda_plugin_read;
@@ -2575,20 +2575,20 @@
   this->input_plugin.get_optional_data  = cdda_plugin_get_optional_data;
   this->input_plugin.dispose            = cdda_plugin_dispose;
   this->input_plugin.input_class        = cls_gen;
-  
+
   /*
    * Lookup config entries.
    */
-  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.use_cddb", 
-			      &enable_entry)) 
+  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.use_cddb",
+			      &enable_entry))
     enable_cddb_changed_cb(class, &enable_entry);
 
-  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_server", 
-			      &server_entry)) 
+  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_server",
+			      &server_entry))
     server_changed_cb(class, &server_entry);
-  
-  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_port", 
-			      &port_entry)) 
+
+  if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_port",
+			      &port_entry))
     port_changed_cb(class, &port_entry);
 
   class->cddb_error = cddb_error;
@@ -2643,15 +2643,15 @@
   this->mrls = NULL;
   this->mrls_allocated_entries = 0;
   this->ip = NULL;
-  
-  this->cdda_device = config->register_filename(config, "media.audio_cd.device", 
+
+  this->cdda_device = config->register_filename(config, "media.audio_cd.device",
 					      DEFAULT_CDDA_DEVICE, XINE_CONFIG_STRING_IS_DEVICE_NAME,
 					      _("device used for CD audio"),
 					      _("The path to the device, usually a "
 						"CD or DVD drive, which you intend to use "
 						"for playing audio CDs."),
 					      10, cdda_device_cb, (void *) this);
-  
+
   config->register_bool(config, "media.audio_cd.use_cddb", 1,
 			_("query CDDB"), _("Enables CDDB queries, which will give you "
 			"convenient title and track names for your audio CDs.\n"
@@ -2659,7 +2659,7 @@
 			"is retrieved from an internet server which might collect a profile "
 			"of your listening habits."),
 			10, enable_cddb_changed_cb, (void *) this);
-  
+
   config->register_string(config, "media.audio_cd.cddb_server", CDDB_SERVER,
 			  _("CDDB server name"), _("The CDDB server used to retrieve the "
 			  "title and track information from.\nThis setting is security critical, "
@@ -2667,12 +2667,12 @@
 			  "and could answer the queries with malicious replies. Be sure to enter "
 			  "a server you can trust."), XINE_CONFIG_SECURITY,
 			  server_changed_cb, (void *) this);
-  
+
   config->register_num(config, "media.audio_cd.cddb_port", CDDB_PORT,
 		       _("CDDB server port"), _("The server port used to retrieve the "
 		       "title and track information from."), XINE_CONFIG_SECURITY,
 		       port_changed_cb, (void *) this);
-  
+
 #ifdef CDROM_SELECT_SPEED
   config->register_num(config, "media.audio_cd.drive_slowdown", 4,
 		       _("slow down disc drive to this speed factor"),

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -30,7 +30,7 @@
  * 01-Feb-2005 Pekka Jääskeläinen <poj@...>
  *
  *             - This history log started.
- *             - Disabled the automatic EPG updater thread until EPG demuxer 
+ *             - Disabled the automatic EPG updater thread until EPG demuxer
  *               is done (it caused pausing of video stream), now EPG is
  *               updated only on demand when the EPG OSD is displayed and
  *               no data is in cache.
@@ -39,10 +39,10 @@
  *             - Now tuning to an erroneus channel shouldn't hang but stop
  *               the playback and output a log describing the error.
  *             - Style cleanups here and there.
- * 
+ *
  * 06-Apr-2006 Jack Steven Kelliher
  *	       - Add ATSC support
- *   
+ *
  * TODO/Wishlist: (not in any order)
  * - Parse all Administrative PIDs - NIT,SDT,CAT etc
  * - As per James' suggestion, we need a way for the demuxer
@@ -52,7 +52,7 @@
  *   Alevtd can read it.
  * - Allow the user to view one set of PIDs (channel) while
  *   recording another on the same transponder - this will require either remuxing or
- *   perhaps bypassing the TS demuxer completely - we could easily have access to the 
+ *   perhaps bypassing the TS demuxer completely - we could easily have access to the
  *   individual audio/video streams via seperate read calls, so send them to the decoders
  *   and save the TS output to disk instead of passing it to the demuxer.
  *   This also gives us full control over the streams being played..hmm..control...
@@ -60,7 +60,7 @@
  * - Allow the user to find and tune new stations from within xine, and
  *   do away with the need for dvbscan & channels.conf file.
  * - Enable use of Conditional Access devices for scrambled content.
- * - if multiple cards are available, optionally use these to record/gather si info, 
+ * - if multiple cards are available, optionally use these to record/gather si info,
  *   and leave primary card for viewing.
  * - allow for handing off of EPG data to specialised frontends, instead of displaying via
  *   OSD - this will allow for filtering/searching of epg data - useful for automatic recording :)
@@ -71,7 +71,7 @@
 #endif
 
 /* pthread.h must be included first so rest of the headers are imported
-   thread safely (on some systems). 
+   thread safely (on some systems).
    However, including it before config.h causes problems with asprintf not
    being declared (glibc 2.3.6)
 */
@@ -128,7 +128,7 @@
 
 #define DVB_NOPID 0xffff
 
-/* define stream types 
+/* define stream types
  * administrative/system PIDs first */
 #define INTERNAL_FILTER 0
 #define PATFILTER 1
@@ -201,7 +201,7 @@
 #define EPG_PIXELS_BETWEEN_TEXT_ROWS 2
 #define EPG_PIXELS_BETWEEN_PROGRAM_ENTRIES 2
 
-/* How many pixels the background of the OSD is bigger than the text area? 
+/* How many pixels the background of the OSD is bigger than the text area?
    The margin is for each side of the background box. */
 #define EPG_BACKGROUND_MARGIN 5
 
@@ -212,10 +212,10 @@
 
 /* How many seconds an EPG entry with the running flag on can be "late"
    according to the system time before discarding it as an old program?
-   
-   This margin is needed because in channel list OSD some EPG entries of 
+
+   This margin is needed because in channel list OSD some EPG entries of
    some channels may be updated a very long ago (if user has watched another
-   channel in different mux) so we have to resort to system clock for 
+   channel in different mux) so we have to resort to system clock for
    figuring out the current program. */
 #define MAX_EPG_ENTRY_LATENESS 5*60.0
 
@@ -237,12 +237,12 @@
   int                            fd_subfilter[MAX_SUBTITLES];
 
   struct dvb_frontend_info       feinfo;
-  
+
   int				 adapter_num;
 
-  char 				*dvr_device;
+  char				*dvr_device;
   char				*demux_device;
-  
+
   struct dmx_pes_filter_params   pesFilterParams[MAX_FILTERS];
   struct dmx_pes_filter_params   subFilterParams[MAX_SUBTITLES];
   struct dmx_sct_filter_params	 sectFilterParams[MAX_FILTERS];
@@ -254,16 +254,16 @@
 typedef struct {
 
   /* Program's name. */
-  char 		     *progname;
[... 1383 lines omitted ...]
     this->tuned_in = 1;
-    
+
     /* now read the pat, find all accociated PIDs and add them to the stream */
     dvb_parse_si(this);
 
@@ -3001,14 +3001,14 @@
     if (this->dvb_gui_enabled) {
       /* Start the EPG updater thread. */
       this->epg_updater_stop = 0;
-      if (pthread_create(&this->epg_updater_thread, NULL, 
+      if (pthread_create(&this->epg_updater_thread, NULL,
 		         epg_data_updater, this) != 0) {
 	  xprintf(
 	      this->class->xine, XINE_VERBOSITY_LOG,
 	      _("input_dvb: cannot create EPG updater thread\n"));
 	  return 0;
       }
-    } 
+    }
 #endif
     /*
      * this osd is used to draw the "recording" sign
@@ -3027,8 +3027,8 @@
     this->stream->osd_renderer->set_position(this->channel_osd, 20, 10);
     this->stream->osd_renderer->set_encoding(this->channel_osd, NULL);
 
-    /* 
-     * this osd is for displaying currently shown channel name 
+    /*
+     * this osd is for displaying currently shown channel name
      */
     this->name_osd = this->stream->osd_renderer->new_object(this->stream->osd_renderer, 301, 61);
     this->stream->osd_renderer->set_position(this->name_osd, 20, 10);
@@ -3036,8 +3036,8 @@
     this->stream->osd_renderer->set_encoding(this->name_osd, NULL);
     this->stream->osd_renderer->set_text_palette(this->name_osd, XINE_TEXTPALETTE_YELLOW_BLACK_TRANSPARENT, OSD_TEXT3);
 
-    /* 
-     * this osd is for displaying Recording Paused 
+    /*
+     * this osd is for displaying Recording Paused
      */
     this->paused_osd = this->stream->osd_renderer->new_object(this->stream->osd_renderer, 301, 161);
     this->stream->osd_renderer->set_position(this->paused_osd, 10, 50);
@@ -3045,10 +3045,10 @@
     this->stream->osd_renderer->set_encoding(this->paused_osd, NULL);
     this->stream->osd_renderer->set_text_palette(this->paused_osd, XINE_TEXTPALETTE_YELLOW_BLACK_TRANSPARENT, OSD_TEXT3);
 
-    /* 
+    /*
      * This osd is for displaying Program Information (EIT), i.e., EPG.
      */
-    this->proginfo_osd = 
+    this->proginfo_osd =
 	this->stream->osd_renderer->new_object(
 	    this->stream->osd_renderer, EPG_WIDTH, EPG_HEIGHT);
 
@@ -3057,10 +3057,10 @@
     this->stream->osd_renderer->set_text_palette(this->proginfo_osd, XINE_TEXTPALETTE_WHITE_NONE_TRANSLUCID, OSD_TEXT3);
     this->stream->osd_renderer->set_text_palette(this->proginfo_osd, XINE_TEXTPALETTE_YELLOW_BLACK_TRANSPARENT, OSD_TEXT4);
 
-    this->background = 
+    this->background =
 	this->stream->osd_renderer->new_object(
-	    this->stream->osd_renderer, 
-	    EPG_WIDTH + EPG_BACKGROUND_MARGIN*2, 
+	    this->stream->osd_renderer,
+	    EPG_WIDTH + EPG_BACKGROUND_MARGIN*2,
 	    EPG_HEIGHT + EPG_BACKGROUND_MARGIN*2);
 
     this->epg_displaying = 0;
@@ -3092,7 +3092,7 @@
     /* Clear all pids, the pmt will tell us which to use */
     for (x = 0; x < MAX_FILTERS; x++){
       this->channels[this->channel].pid[x] = DVB_NOPID;
-    }  
+    }
 
 
     return 1;
@@ -3128,16 +3128,16 @@
   this->fd           = -1;
   this->tuned_in     = 0;
 #ifndef DVB_NO_BUFFERING
-  this->nbc          = nbc_init (this->stream); 
+  this->nbc          = nbc_init (this->stream);
 #else
-  this->nbc 	= NULL;
+  this->nbc	= NULL;
 #endif
   this->osd          = NULL;
   this->event_queue  = NULL;
   this->record_fd    = -1;
   this->read_failcount = 0;
   this->epg_updater_stop = 0;
-  
+
   this->input_plugin.open              = dvb_plugin_open;
   this->input_plugin.get_capabilities  = dvb_plugin_get_capabilities;
   this->input_plugin.read              = dvb_plugin_read;
@@ -3162,7 +3162,7 @@
 {
     dvb_input_class_t *class = (dvb_input_class_t *) this_gen;
     int x;
-    
+
     for(x=0;x<class->numchannels;x++)
        free(class->autoplaylist[x]);
 
@@ -3208,7 +3208,7 @@
        tuner_dispose(tuner);
        return class->mrls;
     }
-   
+
     tuner_dispose(tuner);
 
     if (xine_config_lookup_entry(class->xine, "media.dvb.remember_channel", &lastchannel_enable)
@@ -3311,7 +3311,7 @@
 			 "really have more than 1 card "
 			 "in your system."),
 		       0, NULL, (void *) this);
-    
+
 
   return this;
 }

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,26 +1,26 @@
-/* 
- * Copyright (C) 2000-2005 the xine project, 
+/*
+ * Copyright (C) 2000-2005 the xine project,
  *                         Rich Wareham <richwareham@...>
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
 /* This file was origninally part of the xine-dvdnav project
- * at http://dvd.sf.net/. 
+ * at http://dvd.sf.net/.
  */
 
 /* TODO:
@@ -123,7 +123,7 @@
 #else
 #define DVD_PATH "/dev/dvd"
 #define RDVD_PATH "/dev/rdvd"
-#endif 
+#endif
 
 /* Some misc. defines */
 #ifdef DVD_VIDEO_LB_LEN
@@ -153,7 +153,7 @@
 
 /* Array to hold MRLs returned by get_autoplay_list */
 #define MAX_DIR_ENTRIES 1250
-#define MAX_STR_LEN     255  
+#define MAX_STR_LEN     255
 
 #if defined (__FreeBSD__)
 # define off64_t off_t
@@ -176,7 +176,7 @@
 
   xine_stream_t    *stream;
   xine_event_queue_t *event_queue;
-  
+
   int               pause_timer;  /* Cell still-time timer            */
   int               pause_counter;
   time_t	    pause_end_time;
@@ -186,7 +186,7 @@
   int64_t           pg_start;
   int32_t           buttonN;
   int               typed_buttonN;/* for XINE_EVENT_INPUT_NUMBER_* */
-  
+
   int32_t           mouse_buttonN;
   int               mouse_in;
 
@@ -195,13 +195,13 @@
   int               seekable;     /* are we seekable? */
   int               mode;         /* MODE_NAVIGATE / MODE_TITLE */
   int               tt, pr;       /* title / chapter */
-        
+
   /* xine specific variables */
   const char       *current_dvd_device; /* DVD device currently open */
   char             *mrl;          /* Current MRL                     */
   dvdnav_t         *dvdnav;       /* Handle for libdvdnav            */
   const char       *dvd_name;
-  
+
   /* special buffer handling for libdvdnav caching */
   pthread_mutex_t   buf_mutex;
   void             *source;
@@ -240,16 +240,16 @@
 /* Callback on device name change */
 static void device_change_cb(void *data, xine_cfg_entry_t *cfg) {
   dvd_input_class_t *class = (dvd_input_class_t *) data;
-  
+
   class->dvd_device = cfg->str_value;
 }
 
 static uint32_t dvd_plugin_get_capabilities (input_plugin_t *this_gen) {
   dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen;
-  
+
   trace_print("Called\n");
 
-  return INPUT_CAP_BLOCK | 
+  return INPUT_CAP_BLOCK |
   /* TODO: figure out if there is any "allow copying" flag on DVD.
    *       maybe set INPUT_CAP_RIP_FORBIDDEN only for encrypted media?
    */
@@ -257,7 +257,7 @@
 #if CAN_SEEK
     (this->seekable ? INPUT_CAP_SEEKABLE : 0) |
 #endif
-    INPUT_CAP_AUDIOLANG | INPUT_CAP_SPULANG | INPUT_CAP_CHAPTERS; 
+    INPUT_CAP_AUDIOLANG | INPUT_CAP_SPULANG | INPUT_CAP_CHAPTERS;
 }
 
 static void read_ahead_cb(void *this_gen, xine_cfg_entry_t *entry) {
@@ -274,7 +274,7 @@
     dvdnav_set_readahead_flag(this->dvdnav, entry->num_value);
   }
 }
- 
+
 static void seek_mode_cb(void *this_gen, xine_cfg_entry_t *entry) {
   dvd_input_class_t *class = (dvd_input_class_t*)this_gen;
 
@@ -289,7 +289,7 @@
[... 675 lines omitted ...]
+
     /* a <title>.<part> was specified -> resume parsing */
 
     /* See if there is a period. */
@@ -1547,7 +1547,7 @@
     tt = strtol(title_part, NULL, 10);
     dvdnav_get_number_of_titles(this->dvdnav, &titles);
     if((tt < 0) || (tt > titles)) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	      "input_dvd: Title %i is out of range (1 to %i).\n", tt, titles);
       dvdnav_close(this->dvdnav);
       this->dvdnav = NULL;
@@ -1561,7 +1561,7 @@
       pr = strtol(delimiter+1, NULL, 10);
       dvdnav_get_number_of_parts(this->dvdnav, tt, &parts);
       if ((pr < 0) || (pr > parts)) {
-	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		"input_dvd: Part %i is out of range (1 to %i).\n", pr, parts);
 	dvdnav_close(this->dvdnav);
 	this->dvdnav = NULL;
@@ -1625,7 +1625,7 @@
   static const char handled_mrl[] = "dvd:/";
 
   trace_print("Called\n");
-  
+
   /* Check we can handle this MRL */
   if (strncasecmp (data, handled_mrl, sizeof(handled_mrl)-1 ) != 0)
     return NULL;
@@ -1675,9 +1675,9 @@
 
   pthread_mutex_init(&this->buf_mutex, NULL);
   this->freeing                = 0;
-  
+
   this->event_queue = xine_event_new_queue (this->stream);
-  
+
   /* config callbacks may react now */
   class->ip = this;
 
@@ -1686,7 +1686,7 @@
 
 /* FIXME: adapt to new api. */
 #if 0
-static xine_mrl_t **dvd_class_get_dir (input_class_t *this_gen, 
+static xine_mrl_t **dvd_class_get_dir (input_class_t *this_gen,
 						       const char *filename, int *nFiles) {
   dvd_input_class_t *this = (dvd_input_class_t*)this_gen;
 
@@ -1703,11 +1703,11 @@
 }
 #endif
 
-static char **dvd_class_get_autoplay_list (input_class_t *this_gen, 
+static char **dvd_class_get_autoplay_list (input_class_t *this_gen,
 					    int *num_files) {
 
   dvd_input_class_t *this = (dvd_input_class_t *) this_gen;
-  trace_print("get_autoplay_list entered\n"); 
+  trace_print("get_autoplay_list entered\n");
 
   this->filelist[0] = "dvd:/";
   this->filelist[1] = NULL;
@@ -1754,7 +1754,7 @@
   this = (dvd_input_class_t *) calloc(1, sizeof (dvd_input_class_t));
   if (!this)
     return NULL;
-  
+
   this->input_class.get_instance       = dvd_class_get_instance;
   this->input_class.identifier         = "DVD";
   this->input_class.description        = N_("DVD Navigator");
@@ -1765,7 +1765,7 @@
   this->input_class.get_autoplay_list  = dvd_class_get_autoplay_list;
   this->input_class.dispose            = dvd_class_dispose;
   this->input_class.eject_media        = dvd_class_eject_media;
-  
+
   this->config                         = config;
   this->xine                           = xine;
 
@@ -1789,7 +1789,7 @@
     char *raw_device;
     static const char *const decrypt_modes[] = { "key", "disc", "title", NULL };
     int mode;
-    
+
     raw_device = config->register_filename(config, "media.dvd.raw_device",
 					 RDVD_PATH, XINE_CONFIG_STRING_IS_DEVICE_NAME,
 					 _("raw device set up for DVD access"),
@@ -1804,14 +1804,14 @@
 					   "(man raw) for further information."),
 					 10, NULL, NULL);
     if (raw_device) xine_setenv("DVDCSS_RAW_DEVICE", raw_device, 0);
-    
+
     mode = config->register_enum(config, "media.dvd.css_decryption_method", 0,
 				 decrypt_modes, _("CSS decryption method"),
 				 _("Selects the decryption method libdvdcss will use to descramble "
 				   "copy protected DVDs. Try the various methods, if you have problems "
 				   "playing scrambled DVDs."), 20, NULL, NULL);
     xine_setenv("DVDCSS_METHOD", decrypt_modes[mode], 0);
-    
+
     if(xine->verbosity > XINE_VERBOSITY_NONE)
       xine_setenv("DVDCSS_VERBOSE", "2", 0);
     else
@@ -1819,7 +1819,7 @@
 
     dlclose(dvdcss);
   }
-  
+
   config->register_num(config, "media.dvd.region",
 		       1,
 		       _("region the DVD player claims to be in (1 to 8)"),
@@ -1891,7 +1891,7 @@
 
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "DVD", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 1]

diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -74,11 +74,11 @@
  */
 
 struct xine_s {
-  
+
   config_values_t           *config;
 
   plugin_catalog_t          *plugin_catalog;
-  
+
   int                        verbosity;
 
   int                        demux_strategy;
@@ -89,7 +89,7 @@
 
   xine_list_t               *streams;
   pthread_mutex_t            streams_lock;
-  
+
   metronom_clock_t          *clock;
 
   /** Handle for libxdg-basedir functions. It's actually an xdgHandle. */
@@ -115,34 +115,34 @@
    * the ticket before any operation that might block
    *
    * you must never write to this member directly
-   */  
+   */
   int    ticket_revoked;
-  
+
   /* apply for a ticket; between acquire and relese of an irrevocable
    * ticket (be sure to pair them properly!), it is guaranteed that you
    * will never be blocked by ticket revocation */
   void (*acquire)(xine_ticket_t *self, int irrevocable);
-  
+
   /* give a ticket back */
   void (*release)(xine_ticket_t *self, int irrevocable);
-  
+
   /* renew a ticket, when it has been revoked, see ticket_revoked above;
    * irrevocable must be set to one, if your thread might have acquired
    * irrevocable tickets you don't know of; set it to zero only when
    * you know that this is impossible */
   void (*renew)(xine_ticket_t *self, int irrevocable);
-  
+
 #ifdef XINE_ENGINE_INTERNAL
   /* allow handing out new tickets */
   void (*issue)(xine_ticket_t *self, int atomic);
-  
+
   /* revoke all tickets and deny new ones;
    * a pair of atomic revoke and issue cannot be interrupted by another
    * revocation or by other threads acquiring tickets */
   void (*revoke)(xine_ticket_t *self, int atomic);
-  
+
   /* behaves like acquire() but doesn't block the calling thread; when
-   * the thread would have been blocked, 0 is returned otherwise 1 
+   * the thread would have been blocked, 0 is returned otherwise 1
    * this function acquires a ticket even if ticket revocation is active */
   int (*acquire_nonblocking)(xine_ticket_t *self, int irrevocable);
 
@@ -154,7 +154,7 @@
   void (*unlock_port_rewiring)(xine_ticket_t *self);
 
   void (*dispose)(xine_ticket_t *self);
-  
+
   pthread_mutex_t lock;
   pthread_mutex_t revoke_lock;
   pthread_cond_t  issued;
@@ -194,25 +194,25 @@
  */
 
 struct xine_stream_s {
- 
+
   /* reference to xine context */
   xine_t                    *xine;
 
-  /* metronom instance used by current stream */  
+  /* metronom instance used by current stream */
   metronom_t                *metronom;
-  
+
   /* demuxers use input_plugin to read data */
   input_plugin_t            *input_plugin;
-  
+
   /* used by video decoders */
   xine_video_port_t         *video_out;
-  
+
   /* demuxers send data to video decoders using this fifo */
   fifo_buffer_t             *video_fifo;
-  
+
   /* used by audio decoders */
   xine_audio_port_t         *audio_out;
-  
+
   /* demuxers send data to audio decoders using this fifo */
   fifo_buffer_t             *audio_fifo;
 
@@ -225,10 +225,10 @@
 
   /* input_dvd uses this one. is it possible to add helper functions instead? */
   spu_decoder_t             *spu_decoder_plugin;
-    
+
   /* dxr3 use this one, should be possible to fix to use the port instead */
   vo_driver_t               *video_driver;
-  
+
   /* these definitely should be made private! */
   int                        audio_channel_auto;
   int                        spu_decoder_streamtype;
@@ -236,13 +236,13 @@
   int                        spu_channel_auto;
   int                        spu_channel_letterbox;
   int                        spu_channel;
-    
+
   /* current content detection method, see METHOD_BY_xxx */
   int                        content_detection_method;
 
 #ifdef XINE_ENGINE_INTERNAL
   /* these are private variables, plugins must not access them */
-  
+
   int                        status;
 
   /* lock controlling speed change access */
@@ -271,7 +271,7 @@
   extra_info_t              *video_decoder_extra_info;
   int                        video_decoder_streamtype;
   int                        video_channel;
-  
+
   uint32_t                   audio_track_map[50];
   int                        audio_track_map_entries;
 
@@ -317,15 +317,15 @@
   /* wait for headers sent / stream decoding finished */
   pthread_mutex_t            counter_lock;
   pthread_cond_t             counter_changed;
-  int                        header_count_audio; 
-  int                        header_count_video; 
-  int                        finished_count_audio; 
-  int                        finished_count_video; 
+  int                        header_count_audio;
+  int                        header_count_video;
+  int                        finished_count_audio;
+  int                        finished_count_video;
 
   /* event mechanism */
   xine_list_t               *event_queues;
   pthread_mutex_t            event_queues_lock;
-  
+
   /* demux thread stuff */
   pthread_t                  demux_thread;
   pthread_mutex_t            demux_lock;
@@ -339,14 +339,14 @@
   int                        delay_finish_event; /* delay event in 1/10 sec units. 0=>no delay, -1=>forever */
 
   int                        slave_affection;   /* what operations need to be propagated down to the slave? */
-  
+
   int                        err;
-  
+
   xine_post_out_t            video_source;
   xine_post_out_t            audio_source;
-  
+
   broadcaster_t             *broadcaster;
-  
+
   refcounter_t              *refcounter;
 #endif
 };
@@ -387,11 +387,11 @@
 void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ) XINE_PROTECTED;
 
 void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) XINE_PROTECTED;
-                        
-                        
+
+
 /* demuxer helper functions from demux.c */
 
-/* 
+/*
  *  Flush audio and video buffers. It is called from demuxers on
  *  seek/stop, and may be useful when user input changes a stream and
  *  xine-lib has cached buffers that have yet to be played.
@@ -421,9 +421,9 @@
                         int input_normpos, int input_time, int total_time,
                         uint32_t frame_number) XINE_PROTECTED;
 
-int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, 
-                            int size, int64_t pts, uint32_t type, 
-                            uint32_t decoder_flags, off_t input_normpos, 
+int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input,
+                            int size, int64_t pts, uint32_t type,
+                            uint32_t decoder_flags, off_t input_normpos,
                             int input_time, int total_time,
                             uint32_t frame_number) XINE_PROTECTED;
 
@@ -436,7 +436,7 @@
  */
 void _x_mrl_unescape(char *mrl) XINE_PROTECTED;
 
-/* 
+/*
  * plugin_loader functions
  *
  */
diff --git a/include/xine/xine_plugin.h b/include/xine/xine_plugin.h
--- a/include/xine/xine_plugin.h
+++ b/include/xine/xine_plugin.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -33,7 +33,7 @@
 #define PLUGIN_VIDEO_OUT      7
 #define PLUGIN_POST           8
 
-#define PLUGIN_TYPE_MAX       PLUGIN_POST           
+#define PLUGIN_TYPE_MAX       PLUGIN_POST
 
 /* this flag may be or'ed with type in order to force preloading the plugin.
  * very useful to register config items on xine initialization.
diff --git a/include/xine/xineintl.h b/include/xine/xineintl.h
--- a/include/xine/xineintl.h
+++ b/include/xine/xineintl.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h
--- a/include/xine/xineutils.h
+++ b/include/xine/xineutils.h
@@ -47,7 +47,7 @@
 #include <stdio.h>
 #include <string.h>
 
-/* 
+/*
  * Mark exported data symbols for link engine library clients with older
  * Win32 compilers
  */
diff --git a/include/xine/xmlparser.h b/include/xine/xmlparser.h
--- a/include/xine/xmlparser.h
+++ b/include/xine/xmlparser.h
@@ -88,9 +88,9 @@
 void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED;
 
 const char *xml_parser_get_property (const xml_node_t *node, const char *name) XINE_PROTECTED;
-int   xml_parser_get_property_int (const xml_node_t *node, const char *name, 
+int   xml_parser_get_property_int (const xml_node_t *node, const char *name,
 				   int def_value) XINE_PROTECTED;
-int xml_parser_get_property_bool (const xml_node_t *node, const char *name, 
+int xml_parser_get_property_bool (const xml_node_t *node, const char *name,
 				  int def_value) XINE_PROTECTED;
 
 /* for output:
diff --git a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,5 +7,5 @@
 noinst_LTLIBRARIES = libxineposix.la
 noinst_HEADERS = os_internal.h
 
-libxineposix_la_SOURCES = 
+libxineposix_la_SOURCES =
 libxineposix_la_LIBADD = @LTLIBOBJS@
diff --git a/lib/asprintf.c b/lib/asprintf.c
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -29,7 +29,7 @@
 {
   char *buf = NULL;
   int size = 128;
-  
+
   for (;;)
   {
     int ret;
@@ -41,11 +41,11 @@
       return -1;
     }
     buf = newbuf;
-    
+
     va_copy (cp, ap);
     ret = vsnprintf (buf, size, format, cp);
     va_end (cp);
-    
+
     if (ret >= 0 && ret < size)
     {
       *buffer = realloc (buf, ret + 1);
diff --git a/lib/dirent_msvc.c b/lib/dirent_msvc.c
--- a/lib/dirent_msvc.c
+++ b/lib/dirent_msvc.c
@@ -11,7 +11,7 @@
     that this copyright and permissions notice appear in all copies and
     derivatives, and that no charge may be made for the software and its
     documentation except to cover cost of distribution.
-    
+
     This software is supplied "as is" without express or implied warranty.
 
     But that said, if there are any problems please get in touch.
diff --git a/lib/strsep.c b/lib/strsep.c
--- a/lib/strsep.c
+++ b/lib/strsep.c
@@ -35,7 +35,7 @@
 
 /*
  * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
+ * strings separated by characters from delim.
  *
  * Writes NULs into the string at *stringp to end tokens.
  * delim need not remain constant from call to call.
diff --git a/m4/attributes.m4 b/m4/attributes.m4
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -25,7 +25,7 @@
 dnl of the text of the Macro appear in them. The GNU General Public
 dnl License (GPL) does govern all other use of the material that
 dnl constitutes the Autoconf Macro.
-dnl 
+dnl
 dnl This special exception to the GPL applies to versions of the
 dnl Autoconf Macro released by this project. When you make and
 dnl distribute a modified version of the Autoconf Macro, you may extend
@@ -114,7 +114,7 @@
         dnl First of all check for the --no-undefined variant of GNU ld. This allows
         dnl for a much more readable commandline, so that people can understand what
         dnl it does without going to look for what the heck -z defs does.
-   	for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
+	for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
           CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
 	  break
         done
@@ -257,7 +257,7 @@
 	cc_cv_flag_visibility='yes',
 	cc_cv_flag_visibility='no')
      CFLAGS="$cc_flag_visibility_save_CFLAGS"])
-  
+
   AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
     [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
        [Define this if the compiler supports the -fvisibility flag])
diff --git a/m4/decoders.m4 b/m4/decoders.m4
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -240,7 +240,7 @@
                 x86_64-*)
                     AC_DEFINE([FPM_64BIT], 1, [Define to select libmad fixed point arithmetic implementation])
                     ;;
-                ppc-* | powerpc-*) 
+                ppc-* | powerpc-*)
                     AC_DEFINE([FPM_PPC], 1, [Define to select libmad fixed point arithmetic implementation])
                     ;;
                 sparc*-*)
diff --git a/m4/directx.m4 b/m4/directx.m4
--- a/m4/directx.m4
+++ b/m4/directx.m4
@@ -6,7 +6,7 @@
 dnl
 dnl AM_PATH_DIRECTX([ACTION IF FOUND [, ACTION IF NOT FOUND]]))
 dnl
-dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and 
+dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and
 dnl DIRECTX_VIDEO_LIBS.
 dnl
 AC_DEFUN([AM_PATH_DIRECTX], [
diff --git a/m4/getopt_long.m4 b/m4/getopt_long.m4
--- a/m4/getopt_long.m4
+++ b/m4/getopt_long.m4
@@ -19,13 +19,13 @@
   int option_index = 0;
   int c;
   opterr = 0;
-  while ((c = getopt_long (argc, argv, "?hv", 
+  while ((c = getopt_long (argc, argv, "?hv",
 			   long_options, &option_index)) != EOF)
     ;
   return 0;
 }
 	]])],
-	[AC_MSG_RESULT(yes); 
+	[AC_MSG_RESULT(yes);
 	 ac_getopt_long=yes;
 	 AC_DEFINE(HAVE_GETOPT_LONG,,[Define this if you have GNU getopt_long() implemented])],
 	[AC_MSG_RESULT(no); ac_getopt_long=no],
diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4
--- a/m4/libFLAC.m4
+++ b/m4/libFLAC.m4
@@ -5,7 +5,7 @@
 dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBFLAC],
-[dnl 
+[dnl
 dnl Get the cflags and libraries
 dnl
 AC_ARG_WITH(libFLAC-prefix, AS_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="")
@@ -98,7 +98,7 @@
 
   if test "x$no_libFLAC" = "x" ; then
      AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
+     ifelse([$1], , :, [$1])
   else
      AC_MSG_RESULT(no)
      if test -f conf.libFLACtest ; then
diff --git a/m4/misc.m4 b/m4/misc.m4
--- a/m4/misc.m4
+++ b/m4/misc.m4
@@ -25,7 +25,7 @@
 dnl of the text of the Macro appear in them. The GNU General Public
 dnl License (GPL) does govern all other use of the material that
 dnl constitutes the Autoconf Macro.
-dnl 
+dnl
 dnl This special exception to the GPL applies to versions of the
 dnl Autoconf Macro released by this project. When you make and
 dnl distribute a modified version of the Autoconf Macro, you may extend
diff --git a/m4/pkg.m4 b/m4/pkg.m4
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,5 +1,5 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
+#
 # Copyright © 2004 Scott James Remnant <scott@...>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,7 @@
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
+
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -120,7 +120,7 @@
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
diff --git a/m4/programs.m4 b/m4/programs.m4
--- a/m4/programs.m4
+++ b/m4/programs.m4
@@ -4,7 +4,7 @@
 dnl of GNU msgfmt that do not support the "msgid_plural" extension.
 AC_DEFUN([AC_PROG_GMSGFMT_PLURAL],
  [dnl AC_REQUIRE(AM_GNU_GETTEXT)
-  
+
   if test "$GMSGFMT" != ":"; then
     AC_MSG_CHECKING([for plural forms in GNU msgfmt])
 
@@ -112,7 +112,7 @@
 	      AC_MSG_RESULT(no)
             fi
 	  fi
-        fi 
+        fi
       else
         AC_MSG_RESULT(no)
       fi
diff --git a/m4/summary.m4 b/m4/summary.m4
--- a/m4/summary.m4
+++ b/m4/summary.m4
@@ -239,18 +239,18 @@
     fi
     if test x"$have_vidix" = x"yes"; then
         echo $ECHO_N "   - vidix ("
-      
+
         if test x"$no_x" != x"yes"; then
             echo $ECHO_N "X11"
             if test x"$have_fb" = x"yes"; then
                 echo $ECHO_N " and "
             fi
         fi
-        
+
         if test x"$have_fb" = x"yes"; then
             echo $ECHO_N "framebuffer"
         fi
-      
+
         echo $ECHO_N " support"
 
         if test x"$enable_dha_kmod" != x"no"; then
diff --git a/m4/symbol.m4 b/m4/symbol.m4
--- a/m4/symbol.m4
+++ b/m4/symbol.m4
@@ -24,7 +24,7 @@
 dnl of the text of the Macro appear in them. The GNU General Public
 dnl License (GPL) does govern all other use of the material that
 dnl constitutes the Autoconf Macro.
-dnl 
+dnl
 dnl This special exception to the GPL applies to versions of the
 dnl Autoconf Macro released by the xine project. When you make and
 dnl distribute a modified version of the Autoconf Macro, you may extend
diff --git a/m4/types.m4 b/m4/types.m4
--- a/m4/types.m4
+++ b/m4/types.m4
@@ -21,7 +21,7 @@
 
         if test x"$LIRC_PREFIX" != "x"; then
            lirc_libprefix="$LIRC_PREFIX/lib"
-  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
+	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
         fi
         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
           AC_CHECK_FILE("$llirc/liblirc_client.a",
diff --git a/m4/video_out.m4 b/m4/video_out.m4
--- a/m4/video_out.m4
+++ b/m4/video_out.m4
@@ -371,7 +371,7 @@
     case "$host_or_hostalias" in
         hppa*) xv_libexts="$acl_cv_shlibext" ;;
         *)
-            if test x"$xv_prefer_static" = x"yes"; then  
+            if test x"$xv_prefer_static" = x"yes"; then
                 xv_libexts="$acl_cv_libext $acl_cv_shlibext"
             else
                 xv_libexts="$acl_cv_shlibext $acl_cv_libext"
diff --git a/m4/xine.m4 b/m4/xine.m4
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -1,27 +1,27 @@
 dnl Configure paths for XINE
 dnl
 dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@...>
-dnl  
+dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
-dnl  
+dnl
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl  
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-dnl  
-dnl  
+dnl
+dnl
 dnl As a special exception to the GNU General Public License, if you
 dnl distribute this file as part of a program that contains a configuration
 dnl script generated by Autoconf, you may include it under the same
 dnl distribution terms that you use for the rest of that program.
-dnl  
+dnl
 
 dnl _XINE_VERSION_PARSE(version)
 AC_DEFUN([_XINE_VERSION_PARSE], [`echo $1 | perl -e 'my $v = <>; chomp $v;
diff --git a/misc/Makefile.am b/misc/Makefile.am
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -58,7 +58,7 @@
 	fonts/serif-24.xinefont.gz \
 	fonts/serif-32.xinefont.gz \
 	fonts/serif-48.xinefont.gz \
-	fonts/serif-64.xinefont.gz 
+	fonts/serif-64.xinefont.gz
 
 dist_doc_DATA = fonts/README.cetus
 
diff --git a/misc/cdda_server.c b/misc/cdda_server.c
--- a/misc/cdda_server.c
+++ b/misc/cdda_server.c
@@ -2,19 +2,19 @@
  * CDDA / DVD server
  *
  * Copyright (C) 2003-2007 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -185,21 +185,21 @@
   fd_set   readfds, writefds, exceptfds;
   int      retval;
   struct   timeval timeout;
-  
+
   for(;;) {
-    FD_ZERO(&readfds); 
-    FD_ZERO(&writefds); 
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket, &exceptfds);
-    
-    timeout.tv_sec  = 0; 
+
+    timeout.tv_sec  = 0;
     timeout.tv_usec = 0;
-    
+
     retval = select(socket + 1, &readfds, &writefds, &exceptfds, &timeout);
-    
+
     if(retval == -1 && (errno != EAGAIN && errno != EINTR))
       return 0;
-    
+
     if (retval != -1)
       return 1;
   }
@@ -209,7 +209,7 @@
 
 #if 0
 /*
- * read binary data from socket 
+ * read binary data from socket
  */
 static int sock_data_read (int socket, char *buf, int nlen) {
   int n, num_bytes;
@@ -219,7 +219,7 @@
 
   if(!sock_check_opened(socket))
     return -1;
-  
+
   num_bytes = 0;
 
   while (num_bytes < nlen) {
@@ -259,40 +259,40 @@
 #endif
 
 /*
- * read a line (\n-terminated) from socket 
+ * read a line (\n-terminated) from socket
  */
 static int sock_string_read(int socket, char *buf, int len) {
   char    *pbuf;
   int      r, rr;
   void    *nl;
-  
+
   if((socket < 0) || (buf == NULL))
     return -1;
 
   if(!sock_check_opened(socket))
     return -1;
-  
+
   if (--len < 1)
     return(-1);
-  
+
   pbuf = buf;
-  
+
   do {
-    
+
     if((r = recv(socket, pbuf, len, MSG_PEEK)) <= 0)
       return -1;
 
     if((nl = memchr(pbuf, '\n', r)) != NULL)
       r = ((char *) nl) - pbuf + 1;
-    
+
     if((rr = read(socket, pbuf, r)) < 0)
       return -1;
-    
+
     pbuf += rr;
     len -= rr;
 
   } while((nl == NULL) && len);
-  
+
   if (pbuf > buf && *(pbuf-1) == '\n'){
     *(pbuf-1) = '\0';
   }
@@ -306,21 +306,21 @@
 static int sock_data_write(int socket, char *buf, int len) {
   ssize_t  size;
   int      wlen = 0;
-  
+
   if((socket < 0) || (buf == NULL))
     return -1;
-  
+
   if(!sock_check_opened(socket))
     return -1;
-  
+
   while(len) {
     size = write(socket, buf, len);
-    
+
     if(size <= 0) {
       printf("error writing to socket %d\n",socket);
       return -1;
     }
-    
+
     len -= size;
     wlen += size;
     buf += size;
@@ -332,15 +332,15 @@
 int sock_string_write(int socket, char *msg, ...) {
   char     buf[_BUFSIZ];
   va_list  args;
-  
+
   va_start(args, msg);
   vsnprintf(buf, _BUFSIZ - 1, msg, args);
   va_end(args);
-  
+
   /* Each line sent is '\n' terminated */
   if((buf[strlen(buf)] == '\0') && (buf[strlen(buf) - 1] != '\n'))
       strcat(buf, "\n");
- 
+
   return sock_data_write(socket, buf, strlen(buf));
 }
 
diff --git a/misc/xine-fontconv.c b/misc/xine-fontconv.c
--- a/misc/xine-fontconv.c
+++ b/misc/xine-fontconv.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2001-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * OSD stuff (text and graphic primitives)
  *
- * xine-fontconv.c  
+ * xine-fontconv.c
  *
  * converts ttf fonts to xine osd fonts
  *
@@ -92,7 +92,7 @@
   uint16_t         num_fontchars;
   osd_fontchar_t  *fontchar;
   osd_font_t      *next;
-}; 
+};
 
 
 /* list */
@@ -110,7 +110,7 @@
 
 
 static int gzwrite_i16(gzFile *fp, uint16_t number) {
-  return gzputc(fp, number & 0xFF) != -1 && 
+  return gzputc(fp, number & 0xFF) != -1 &&
          gzputc(fp, (number >> 8) & 0xFF) != -1;
 }
 
@@ -169,7 +169,7 @@
   }
 }
 
-/* 
+/*
  * generate sorted list with unicodes in all given pages,
  * returns number of unicodes in the list
  */
@@ -189,7 +189,7 @@
       continue;
     }
     printf("Used encoding \"%s\"\n", pages[page]);
-    
+
     /* add new unicodes into list */
     for (z = 32; z < 0xFFFF; z++) {
       uint16_t unicode;
@@ -198,7 +198,7 @@
       size_t inbytesleft = z <= 0xFF ? 1 : 2;
       size_t outbytesleft = 2;
       size_t count;
-     
+
       /* get unicode value from index 'z' in this codepage 'pages[i]' */
       count = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
       if (count == (size_t)-1 || inbytesleft != 0) {
@@ -218,7 +218,7 @@
 void print_bitmap (FT_Bitmap *bitmap) {
 
   int x,y;
-  
+
   for( y = 0; y < bitmap->rows; y++ ) {
     for( x = 0; x < bitmap->width; x++ ) {
       if( bitmap->buffer[y*bitmap->width+x] > 1 )
@@ -242,7 +242,7 @@
   bitmap->width = width;
   bitmap->buffer = malloc(width*height);
   memset( bitmap->buffer, 0, width*height );
-  
+
   return bitmap;
 }
 
@@ -250,9 +250,9 @@
   free(bitmap->buffer);
   free(bitmap);
 }
- 
 
-/* 
+
+/*
    This function is called to blend a slightly deslocated
    version of the bitmap. This will produce the border effect.
    Note that the displacement may be smaller than 1 pixel
@@ -264,15 +264,15 @@
   int x,y;
   int x1, y1;
   int dstpos, srcpos;
-  
+
   for( y = 0; y < src->rows; y++ ) {
     for( x = 0; x < src->width; x++ ) {
       srcpos = y * src->width + x;
-      
+
       x1 = x + left;
       if( x1 < 0 || x1 >= dst->width )
         continue;
-        
+
       y1 = y + top;
       if( y1 < 0 || y1 >= dst->rows )
         continue;
[... 127 lines omitted ...]
@@ -447,19 +447,19 @@
 
       glyph_index = FT_Get_Char_Index( face, item->code);
 
-        
+
       if (glyph_index) {
-          
+
         error = FT_Load_Glyph( face,          /* handle to face object */
                                glyph_index,   /* glyph index           */
                                FT_LOAD_DEFAULT );  /* load flags */
-          
+
         if (!error) {
           error = FT_Get_Glyph( face->glyph, &glyph );
-	    
+
           if( i == 0 ) {
             out_bitmap = create_bitmap( f266CeilToInt(thickness + MAX(face->glyph->metrics.horiAdvance, face->glyph->metrics.width + face->glyph->metrics.horiBearingX)),
-                                        f266CeilToInt((max_bearing_y<<6) - face->glyph->metrics.horiBearingY + 
+                                        f266CeilToInt((max_bearing_y<<6) - face->glyph->metrics.horiBearingY +
                                         face->glyph->metrics.height + thickness) );
           }
 
@@ -467,7 +467,7 @@
           origin.y = thickness + border_pos[i][1]*thickness;
 
           error = FT_Glyph_Transform(glyph, NULL, &origin) ||
-                  FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, NULL, 1);  
+                  FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, NULL, 1);
 
           if (error) {
             printf("error generating bitmap [U+%04X]\n", item->code);
@@ -483,24 +483,24 @@
           else
             add_final_bitmap( out_bitmap, &glyph_bitmap->bitmap, glyph_bitmap->left,
                               max_bearing_y - glyph_bitmap->top );
-          converted = 1;          
-                              
+          converted = 1;
+
           FT_Done_Glyph( glyph );
 	}
       }
     }
-    
+
     if( converted ) {
 #ifdef LOG
       printf("[U+%04X] bitmap width: %d height: %d\n", item->code, out_bitmap->width, out_bitmap->rows );
-      /* 
+      /*
       print_bitmap(out_bitmap);
       */
 #endif
       fontchar.code = item->code;
       fontchar.width = out_bitmap->width;
       fontchar.height = out_bitmap->rows;
-  
+
       gzwrite_i16 (fp, fontchar.code);
       gzwrite_i16 (fp, fontchar.width);
       gzwrite_i16 (fp, fontchar.height);
@@ -523,7 +523,7 @@
     list_free(error_unicodes);
   }
   printf ("generated %s (%d characters)\n", filename, font.num_fontchars);
-}  
+}
 
 
 int main(int argc, char *argv[]) {
@@ -548,7 +548,7 @@
     printf ("usage: %s font.ttf fontname [encoding1 [encoding2 [...]]]\n", argv[0]);
     exit (1);
   }
-  
+
   len = strlen (argv[1]);
 
   if (strncasecmp (&argv[1][len-4],".ttf",3)) {
@@ -561,8 +561,8 @@
     printf("error initializing freetype\n");
     return 1;
   }
-  
-  error = FT_New_Face( library, 
+
+  error = FT_New_Face( library,
                        argv[1],
                        0,
                        &face );
@@ -596,21 +596,21 @@
     render_font (face, argv[2], 32, thickness, unicodes);
     render_font (face, argv[2], 48, thickness, unicodes);
     render_font (face, argv[2], 64, thickness, unicodes);
-  } else 
+  } else
     printf("No font generated\n");
 
   list_free(unicodes);
 
   FT_Done_Face(face);
- 
-  FT_Done_FreeType(library); 
+
+  FT_Done_FreeType(library);
 
   /*
    * some rgb -> yuv conversion,
    * can be used to calc new palettes
    */
   /*
-  { 
+  {
     float f;
     for (f=1.0; f<6.0; f+=1.0) {
 
@@ -622,7 +622,7 @@
       Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B ;
       Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B  + 128.0;
       Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B  + 128.0;
-      
+
       printf ("CLUT_Y_CR_CB_INIT(0x%x, 0x%x, 0x%x),\n", (int) Y, (int) Cr, (int) Cb);
     }
   }

diff --git a/src/audio_dec/ff_dvaudio_decoder.c b/src/audio_dec/ff_dvaudio_decoder.c
--- a/src/audio_dec/ff_dvaudio_decoder.c
+++ b/src/audio_dec/ff_dvaudio_decoder.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * dv audio decoder based on patch by Dan Dennedy <dan@...>
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -219,29 +219,29 @@
   int out;
   audio_buffer_t *audio_buffer;
   int bytes_to_send;
-  
+
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
-      
+
   if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     this->buf = calloc(1, AUDIOBUFSIZE);
     this->bufsize = AUDIOBUFSIZE;
     this->size = 0;
     this->decode_buffer = calloc(1, MAXFRAMESIZE);
-    
+
     this->audio_sample_rate = buf->decoder_info[1];
     this->audio_bits = buf->decoder_info[2];
     this->audio_channels = buf->decoder_info[3];
-    
+
     _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio");
-    
+
     this->decoder_ok = 1;
-   
+
     return;
   }
-  
+
   if (this->decoder_ok && !(buf->decoder_flags & (BUF_FLAG_HEADER|BUF_FLAG_SPECIAL))) {
-    
+
     if (!this->output_open) {
       this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
         this->stream, this->audio_bits, this->audio_sample_rate,
@@ -251,11 +251,11 @@
     /* if the audio still isn't open, bail */
     if (!this->output_open)
       return;
-      
+
     if( this->size + buf->size > this->bufsize ) {
       this->bufsize = this->size + 2 * buf->size;
       xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-              _("dvaudio: increasing buffer to %d to avoid overflow.\n"), 
+              _("dvaudio: increasing buffer to %d to avoid overflow.\n"),
               this->bufsize);
       this->buf = realloc( this->buf, this->bufsize );
     }
@@ -273,14 +273,14 @@
           bytes_consumed = dv_frame_profile(&this->buf[offset])->frame_size;
         else
           bytes_consumed = decode_buffer_size;
-        
+
         /* dispatch the decoded audio */
         out = 0;
         while (out < decode_buffer_size) {
-          audio_buffer = 
+          audio_buffer =
             this->stream->audio_out->get_buffer (this->stream->audio_out);
           if (audio_buffer->mem_size == 0) {
-            xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+            xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
                      "dvaudio: Help! Allocated audio buffer with nothing in it!\n");
             return;
           }
@@ -316,7 +316,7 @@
 
 static void dvaudio_reset (audio_decoder_t *this_gen) {
   dvaudio_decoder_t *this = (dvaudio_decoder_t *) this_gen;
-  
+
   this->size = 0;
 }
 
@@ -326,7 +326,7 @@
 static void dvaudio_dispose (audio_decoder_t *this_gen) {
 
   dvaudio_decoder_t *this = (dvaudio_decoder_t *) this_gen;
-  
+
   if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
   this->output_open = 0;
@@ -354,7 +354,7 @@
   this->buf = NULL;
   this->size = 0;
   this->decoder_ok = 0;
-  
+
   return &this->audio_decoder;
 }
 
@@ -372,7 +372,7 @@
   return this;
 }
 
-static uint32_t supported_audio_types[] = { 
+static uint32_t supported_audio_types[] = {
   BUF_AUDIO_DV,
   0
 };
@@ -381,13 +381,13 @@
   supported_audio_types,   /* supported types */
   5                        /* priority        */
 };
-    
+
 /*
  * exported plugin catalog entry
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_DECODER, 16, "dvaudio", XINE_VERSION_CODE, &dec_info_dvaudio, init_dvaudio_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_dec/fooaudio.c b/src/audio_dec/fooaudio.c
--- a/src/audio_dec/fooaudio.c
+++ b/src/audio_dec/fooaudio.c
@@ -130,7 +130,7 @@
    * the accumulator buffer size as necessary */
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	    "fooaudio: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
@@ -151,8 +151,8 @@
      * This decoder generates a continuous sine pattern based on the pts
      * values sent by the xine engine. Two pts values are needed to know
      * how long to make the audio. Thus, If this is the first frame or
-     * a seek has occurred (indicated by this->last_pts = -1), 
-     * log the pts but do not create any audio. 
+     * a seek has occurred (indicated by this->last_pts = -1),
+     * log the pts but do not create any audio.
      *
      * When a valid pts delta is generated, create n audio samples, where
      * n is given as:
@@ -181,7 +181,7 @@
         /* get an audio buffer */
         audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
         if (audio_buffer->mem_size == 0) {
-          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 		   "fooaudio: Help! Allocated audio buffer with nothing in it!\n");
           return;
         }
@@ -196,7 +196,7 @@
 #define WAVE_HZ 300
         /* fill up the samples in the buffer */
         for (i = 0; i < samples_to_send; i++)
-          audio_buffer->mem[i] = 
+          audio_buffer->mem[i] =
             (short)(sin(2 * M_PI * this->iteration++ / WAVE_HZ) * 32767);
 
         /* final prep for audio buffer dispatch */
@@ -296,7 +296,7 @@
   free (this);
 }
 
-/* This function allocates a private audio decoder class and initializes 
+/* This function allocates a private audio decoder class and initializes
  * the class's member functions. */
 static void *init_plugin (xine_t *xine, void *data) {
 
@@ -312,18 +312,18 @@
   return this;
 }
 
-/* This is a list of all of the internal xine audio buffer types that 
+/* This is a list of all of the internal xine audio buffer types that
  * this decoder is able to handle. Check src/xine-engine/buffer.h for a
  * list of valid buffer types (and add a new one if the one you need does
  * not exist). Terminate the list with a 0. */
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   /* BUF_AUDIO_FOO, */
   0
 };
 
 /* This data structure combines the list of supported xine buffer types and
  * the priority that the plugin should be given with respect to other
- * plugins that handle the same buffer type. A plugin with priority (n+1) 
+ * plugins that handle the same buffer type. A plugin with priority (n+1)
  * will be used instead of a plugin with priority (n). */
 static const decoder_info_t dec_info_audio = {
   audio_types,         /* supported types */
diff --git a/src/audio_dec/gsm610.c b/src/audio_dec/gsm610.c
--- a/src/audio_dec/gsm610.c
+++ b/src/audio_dec/gsm610.c
@@ -34,7 +34,7 @@
  * are deemed to have made any representations as to the suitability of this
  * software for any purpose nor are held responsible for any defects of
  * this software.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
- * 
+ *
  * As a matter of courtesy, the authors request to be informed about uses
  * this software has found, about bugs in this software, and about any
  * improvements that may be of general interest.
@@ -125,7 +125,7 @@
 
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	    "gsm610: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
@@ -143,7 +143,7 @@
 
       /* the data should line up on a 65-byte boundary */
       if ((buf->size % 65) != 0) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 		 "gsm610: received MS GSM block that does not line up\n");
         this->size = 0;
         return;
@@ -263,7 +263,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_MSGSM,
   BUF_AUDIO_GSM610,
   0
@@ -275,7 +275,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_DECODER, 16, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -76,11 +76,11 @@
 typedef struct {
   audio_decoder_class_t   decoder_class;
   config_values_t *config;
-  
+
   float            a52_level;
   int              disable_dynrng_compress;
   int              enable_surround_downmix;
-  
+
   const AVCRC     *av_crc;
 } a52dec_class_t;
 
@@ -226,7 +226,7 @@
    */
 #ifdef LOG_PTS
   printf("a52dec:decode_frame:pts=%lld\n",pts);
-#endif 
+#endif
   if (!this->bypass_mode) {
 
     int              a52_output_flags, i;
@@ -278,7 +278,7 @@
 	this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
 
-      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, 
+      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
 							 this->stream, 16,
 							 this->a52_sample_rate,
 							 output_mode) ;
@@ -302,13 +302,13 @@
     for (i = 0; i < 6; i++) {
       if (a52_block (this->a52_state)) {
 	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "liba52: a52_block error on audio channel %d\n", i);
-#if 0	
+#if 0
 	for(n=0;n<2000;n++) {
 	  printf("%02x ",this->frame_buffer[n]);
 	  if ((n % 32) == 0) printf("\n");
 	}
 	printf("\n");
-#endif	
+#endif
 	buf->num_frames = 0;
 	break;
       }
@@ -460,7 +460,7 @@
    * We call the start of an A52 frame a frame header.
    * So, if a A52 pack has 2 "Number of frame headers" is means that the A52 pack contains 2 A52 frame headers.
    * The "First access unit" then tells us which A52 frame the PTS value applies to.
-   * 
+   *
    * Take the following example: -
    * PACK1: PTS = 10. Contains the entire A52 frame1, followed by the beginning of the frame2. PTS applies to frame1.
    * PACK2: PTS = 1000, Contains the rest of frame2, and the whole of frame3. and the start of frame4. PTS applies to frame4.
@@ -582,14 +582,14 @@
             }
           }
           break;
-            
+
     case 2:  /* Filling frame_buffer with sync_info bytes */
 	  *this->frame_ptr++ = *current++;
 	  this->frame_todo--;
 	  if (this->frame_todo < 1) {
 	    this->sync_state = 3;
           } else break;
-      
+
     case 3:  { /* Ready for decode */
       if (av_crc(this->class->av_crc, 0, &this->frame_buffer[2], this->frame_length - 2) != 0) { /* CRC16 failed */
 	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "liba52:a52 frame failed crc16 checksum.\n");
@@ -622,7 +622,7 @@
 	  this->syncword = 0;
 	  this->sync_state = 0;
           break;
-    default: /* No come here */ 
+    default: /* No come here */
           break;
     }
   }
@@ -676,14 +676,14 @@
   this->pts_list_position = 0;
 
   if( !this->a52_state ) {
-    this->a52_state = 
+    this->a52_state =
 #ifdef HAVE_A52DEC_A52_H /* External liba52 */
       /* When using external liba52, enable _all_ capabilities, even
 	 if that might break stuff if they add some new capability
 	 that depends on CPU's caps.
 	 At the moment the only capability is DJBFFT, which is tested
 	 only if djbfft is being used at compile time.
-	 
+
 	 The actual question would be: why don't they check for
 	 capabilities themselves?
       */
diff --git a/src/audio_dec/xine_dts_decoder.c b/src/audio_dec/xine_dts_decoder.c
--- a/src/audio_dec/xine_dts_decoder.c
+++ b/src/audio_dec/xine_dts_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2007 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -75,7 +75,7 @@
   dts_state_t     *dts_state;
   int64_t          pts;
 
-  int              audio_caps;  
+  int              audio_caps;
   int              sync_state;
   int              ac5_length, ac5_pcm_length, frame_todo;
   uint32_t         syncdword;
@@ -83,7 +83,7 @@
   uint8_t         *frame_ptr;
 
   int              output_open;
-  
+
   int              bypass_mode;
   int              dts_flags;
   int              dts_sample_rate;
@@ -91,8 +91,8 @@
   int              dts_flags_map[11]; /* Convert from stream dts_flags to the dts_flags we want from the dts downmixer */
   int              ao_flags_map[11];  /* Convert from the xine AO_CAP's to dts_flags. */
   int              have_lfe;
-  
-  
+
+
 } dts_decoder_t;
 
 static void dts_reset (audio_decoder_t *const this_gen) {
@@ -143,7 +143,7 @@
   int output_mode = AO_CAP_MODE_STEREO;
   uint8_t        *data_out;
   uint8_t        *const data_in = this->frame_buffer;
-  
+
   lprintf("decode_frame\n");
   audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
   audio_buffer->vpts       = pts;
@@ -152,13 +152,13 @@
       /* SPDIF digital output */
       if (!this->output_open) {
         this->output_open = ((this->stream->audio_out->open) (this->stream->audio_out, this->stream,
-                                                            16, this->dts_sample_rate, 
+                                                            16, this->dts_sample_rate,
                                                             AO_CAP_MODE_AC5));
       }
-      
-      if (!this->output_open) 
+
+      if (!this->output_open)
         return;
-      
+
       data_out=(uint8_t *) audio_buffer->mem;
       if (this->ac5_length > 8191) {
         xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "libdts: ac5_length too long\n");
@@ -176,7 +176,7 @@
         ac5_spdif_type = 0x0d; /* DTS-1 (2048-sample bursts) */
         break;
       default:
-        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		"libdts: DTS %i-sample bursts not supported\n", this->ac5_pcm_length);
         return;
       }
@@ -256,17 +256,17 @@
 
       if (!this->output_open) {
         this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
-                                                           16, this->dts_sample_rate, 
+                                                           16, this->dts_sample_rate,
                                                            output_mode);
       }
-      
-      if (!this->output_open) 
+
+      if (!this->output_open)
         return;
-      number_of_dts_blocks = dts_blocks_num (this->dts_state); 
+      number_of_dts_blocks = dts_blocks_num (this->dts_state);
       audio_buffer->num_frames = 256*number_of_dts_blocks;
       for(i = 0; i < number_of_dts_blocks; i++) {
         if(dts_block(this->dts_state)) {
-          xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+          xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
                   "libdts: dts_block error on audio channel %d\n", i);
           audio_buffer->num_frames = 0;
           break;
@@ -320,10 +320,10 @@
         }
       }
     }
-    
+
     this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-   
-  
+
+
 }
 
 static void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
@@ -332,7 +332,7 @@
   uint8_t        *current = (uint8_t *)buf->content;
   uint8_t        *sync_start=current + 1;
   uint8_t        *const end = buf->content + buf->size;
-  
+
   lprintf("decode_data\n");
 
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
@@ -431,14 +431,14 @@
             }
           }
           break;
-            
+
     case 2:  /* Filling frame_buffer with sync_info bytes */
 	  *this->frame_ptr++ = *current++;
 	  this->frame_todo--;
 	  if (this->frame_todo < 1) {
 	    this->sync_state = 3;
           } else break;
-      
+
     case 3:  /* Ready for decode */
 #if 0
           dtsdec_decode_frame (this, this->pts_list[0], buf->decoder_flags & BUF_FLAG_PREVIEW);
@@ -450,18 +450,18 @@
 	  this->syncdword = 0;
 	  this->sync_state = 0;
           break;
-    default: /* No come here */ 
+    default: /* No come here */
           break;
     }
   }
 }
 
 static void dts_dispose (audio_decoder_t *this_gen) {
-  dts_decoder_t *const this = (dts_decoder_t *) this_gen; 
-  
-  if (this->output_open) 
+  dts_decoder_t *const this = (dts_decoder_t *) this_gen;
+
+  if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
-  
+
   free (this);
 }
 
@@ -507,7 +507,7 @@
       this->dts_flags_map[DTS_3F2R]   = DTS_3F2R | DTS_LFE;
       this->ao_flags_map[DTS_2F2R]    = AO_CAP_MODE_4CHANNEL;
       this->ao_flags_map[DTS_3F2R]    = AO_CAP_MODE_5CHANNEL;
-                                                                                                                           
+
     } else if (this->audio_caps & AO_CAP_MODE_5CHANNEL) {
 
       this->dts_flags_map[DTS_2F2R]   = DTS_2F2R;
@@ -574,7 +574,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_DTS, 0
  };
 
@@ -584,7 +584,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_DECODER, 16, "dts", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c
--- a/src/audio_dec/xine_faad_decoder.c
+++ b/src/audio_dec/xine_faad_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2005 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -58,29 +58,29 @@
   audio_decoder_t  audio_decoder;
 
   xine_stream_t    *stream;
-  
+
   /* faad2 stuff */
   NeAACDecHandle           faac_dec;
   NeAACDecConfigurationPtr faac_cfg;
   NeAACDecFrameInfo        faac_finfo;
   int                     faac_failed;
- 
+
   int              raw_mode;
-  
+
   unsigned char   *buf;
   int              size;
   int              rec_audio_src_size;
   int              max_audio_src_size;
   int              pts;
-  
+
   unsigned char   *dec_config;
   int              dec_config_size;
-  
+
   unsigned long    rate;
-  int              bits_per_sample; 
-  unsigned char    num_channels; 
+  int              bits_per_sample;
+  unsigned char    num_channels;
   int              sbr;
-   
+
   int              output_open;
 
   unsigned long    total_time;
@@ -138,7 +138,7 @@
     if( this->dec_config ) {
       used = NeAACDecInit2(this->faac_dec, this->dec_config, this->dec_config_size,
                           &this->rate, &this->num_channels);
-      
+
       if( used < 0 ) {
         xprintf( this->stream->xine, XINE_VERBOSITY_LOG,
                 _("libfaad: libfaad NeAACDecInit2 failed.\n"));
@@ -149,7 +149,7 @@
     } else {
       used = NeAACDecInit(this->faac_dec, this->buf, this->size,
                         &this->rate, &this->num_channels);
-        
+
       if( used < 0 ) {
         xprintf ( this->stream->xine, XINE_VERBOSITY_LOG,
                   _("libfaad: libfaad NeAACDecInit failed.\n"));
@@ -157,16 +157,16 @@
       } else {
         lprintf( "NeAACDecInit() returned rate=%"PRId32" channels=%d (used=%d)\n",
                  this->rate, this->num_channels, used);
-                      
+
         this->size -= used;
         memmove( this->buf, &this->buf[used], this->size );
       }
     }
   }
-  
+
   if( !this->bits_per_sample )
     this->bits_per_sample = 16;
-  
+
   if( this->faac_failed ) {
     if( this->faac_dec ) {
       NeAACDecClose( this->faac_dec );
@@ -176,7 +176,7 @@
   } else {
     faad_meta_info_set(this);
   }
-  
+
   return this->faac_failed;
 }
 
@@ -184,10 +184,10 @@
   int ao_cap_mode;
 
   this->rec_audio_src_size = this->num_channels * FAAD_MIN_STREAMSIZE;
-       
+
   switch( this->num_channels ) {
     case 1:
-      ao_cap_mode=AO_CAP_MODE_MONO; 
+      ao_cap_mode=AO_CAP_MODE_MONO;
       break;
     case 6:
       if(this->stream->audio_out->get_capabilities(this->stream->audio_out) &
@@ -202,11 +202,11 @@
       }
     case 2:
[... 98 lines omitted ...]
+
     if(used >= this->size){
       this->size = 0;
     } else {
@@ -335,7 +335,7 @@
     }
 
     if( !this->raw_mode )
-      this->size = 0;   
+      this->size = 0;
   }
 
   if( this->size )
@@ -346,31 +346,31 @@
 static void faad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   faad_decoder_t *this = (faad_decoder_t *) this_gen;
-  
+
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
   /* store config information from ESDS mp4/qt atom */
   if( !this->faac_dec && (buf->decoder_flags & BUF_FLAG_SPECIAL) &&
       buf->decoder_info[1] == BUF_SPECIAL_DECODER_CONFIG ) {
-    
+
     this->dec_config = malloc(buf->decoder_info[2]);
     this->dec_config_size = buf->decoder_info[2];
     memcpy(this->dec_config, buf->decoder_info_ptr[2], buf->decoder_info[2]);
-    
+
     if( faad_open_dec(this) )
       return;
 
     this->raw_mode = 0;
   }
 
-  /* get audio parameters from file header 
-     (may be overwritten by libfaad returned parameters) */  
+  /* get audio parameters from file header
+     (may be overwritten by libfaad returned parameters) */
   if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     this->rate=buf->decoder_info[1];
-    this->bits_per_sample=buf->decoder_info[2] ; 
-    this->num_channels=buf->decoder_info[3] ; 
- 
+    this->bits_per_sample=buf->decoder_info[2] ;
+    this->num_channels=buf->decoder_info[3] ;
+
     if( buf->size > sizeof(xine_waveformatex) ) {
       xine_waveformatex *wavex = (xine_waveformatex *) buf->content;
 
@@ -379,7 +379,7 @@
         this->dec_config_size = wavex->cbSize;
         memcpy(this->dec_config, buf->content + sizeof(xine_waveformatex),
                wavex->cbSize);
-               
+
         if( faad_open_dec(this) )
           return;
 
@@ -395,15 +395,15 @@
 
     if( !this->size )
       this->pts = buf->pts;
-  
+
     if( this->size + buf->size > this->max_audio_src_size ) {
       this->max_audio_src_size = this->size + 2 * buf->size;
       this->buf = realloc( this->buf, this->max_audio_src_size );
     }
-  
+
     memcpy (&this->buf[this->size], buf->content, buf->size);
     this->size += buf->size;
-    
+
     if( !this->faac_dec && faad_open_dec(this) )
       return;
 
@@ -421,23 +421,23 @@
 
 static void faad_dispose (audio_decoder_t *this_gen) {
 
-  faad_decoder_t *this = (faad_decoder_t *) this_gen; 
+  faad_decoder_t *this = (faad_decoder_t *) this_gen;
 
-  if (this->output_open) 
+  if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
   this->output_open = 0;
-    
+
   if( this->buf )
     free(this->buf);
   this->buf = NULL;
   this->size = 0;
   this->max_audio_src_size = 0;
-  
+
   if( this->dec_config )
     free(this->dec_config);
   this->dec_config = NULL;
   this->dec_config_size = 0;
-  
+
   if( this->faac_dec )
     NeAACDecClose(this->faac_dec);
   this->faac_dec = NULL;
@@ -461,7 +461,7 @@
   this->stream             = stream;
   this->output_open        = 0;
   this->raw_mode           = 1;
-  this->faac_dec           = NULL; 
+  this->faac_dec           = NULL;
   this->faac_failed        = 0;
   this->buf                = NULL;
   this->size               = 0;
@@ -490,7 +490,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_AAC, 0
  };
 

diff --git a/src/audio_dec/xine_lpcm_decoder.c b/src/audio_dec/xine_lpcm_decoder.c
--- a/src/audio_dec/xine_lpcm_decoder.c
+++ b/src/audio_dec/xine_lpcm_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -62,10 +62,10 @@
   xine_stream_t   *stream;
 
   uint32_t         rate;
-  uint32_t         bits_per_sample; 
-  uint32_t         number_of_channels; 
-  uint32_t         ao_cap_mode; 
-   
+  uint32_t         bits_per_sample;
+  uint32_t         number_of_channels;
+  uint32_t         ao_cap_mode;
+
   int              output_open;
   int		   cpu_be;	/**< TRUE, if we're a Big endian CPU */
 } lpcm_decoder_t;
@@ -86,7 +86,7 @@
   int             stream_be;
   audio_buffer_t *audio_buffer;
   int             format_changed = 0;
-  
+
   /* Drop preview data */
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
@@ -97,7 +97,7 @@
     unsigned int bits_per_sample = 16;
     unsigned int sample_rate = 0;
     unsigned int num_channels;
-      
+
     num_channels = (buf->decoder_info[2] & 0x7) + 1;
     switch ((buf->decoder_info[2]>>4) & 3) {
     case 0: sample_rate = 48000; break;
@@ -110,7 +110,7 @@
       case 1: bits_per_sample = 20; break;
       case 2: bits_per_sample = 24; break;
     }
-    
+
     if( this->bits_per_sample != bits_per_sample ||
         this->number_of_channels != num_channels ||
         this->rate != sample_rate ||
@@ -119,16 +119,16 @@
       this->number_of_channels = num_channels;
       this->rate = sample_rate;
       format_changed++;
-    } 
+    }
   }
-  
+
   if( buf->decoder_flags & BUF_FLAG_STDHEADER ) {
     this->rate=buf->decoder_info[1];
-    this->bits_per_sample=buf->decoder_info[2] ; 
-    this->number_of_channels=buf->decoder_info[3] ; 
+    this->bits_per_sample=buf->decoder_info[2] ;
+    this->number_of_channels=buf->decoder_info[3] ;
     format_changed++;
   }
-  
+
   /*
    * (re-)open output device
    */
@@ -152,11 +152,11 @@
 
     /* stream/meta info */
     _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Linear PCM");
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, 
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE,
         this->bits_per_sample * this->rate * this->number_of_channels);
   }
 
-  if (!this->output_open || (buf->decoder_flags & BUF_FLAG_HEADER) ) 
+  if (!this->output_open || (buf->decoder_flags & BUF_FLAG_HEADER) )
     return;
 
   audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
@@ -164,7 +164,7 @@
   /* Swap LPCM samples into native byte order, if necessary */
   buf->type &= 0xffff0000;
   stream_be = ( buf->type == BUF_AUDIO_LPCM_BE );
- 
+
   if( this->bits_per_sample == 16 ){
     if (stream_be != this->cpu_be)
       swab (sample_buffer, audio_buffer->mem, buf->size);
@@ -175,20 +175,20 @@
     uint8_t *s = (uint8_t *)sample_buffer;
     uint8_t *d = (uint8_t *)audio_buffer->mem;
     int n = buf->size;
-    
+
     if (stream_be != this->cpu_be) {
       while( n >= 0 ) {
         swab( s, d, 8 );
         s += 10;
         d += 8;
-        n -= 10; 
+        n -= 10;
       }
     } else {
       while( n >= 0 ) {
         memcpy( d, s, 8 );
         s += 10;
         d += 8;
-        n -= 10; 
+        n -= 10;
       }
     }
   } else if( this->bits_per_sample == 24 ) {
@@ -227,7 +227,7 @@
   } else {
     memcpy (audio_buffer->mem, sample_buffer, buf->size);
   }
-  
+
   audio_buffer->vpts       = buf->pts;
   audio_buffer->num_frames = (((buf->size*8)/this->number_of_channels)/this->bits_per_sample);
 
@@ -236,9 +236,9 @@
 }
 
 static void lpcm_dispose (audio_decoder_t *this_gen) {
-  lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen; 
+  lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen;
 
-  if (this->output_open) 
+  if (this->output_open)
     this->stream->audio_out->close (this->stream->audio_out, this->stream);
   this->output_open = 0;
 
@@ -258,11 +258,11 @@
 
   this->output_open   = 0;
   this->rate          = 0;
-  this->bits_per_sample=0; 
-  this->number_of_channels=0; 
-  this->ao_cap_mode=0; 
+  this->bits_per_sample=0;
+  this->number_of_channels=0;
+  this->ao_cap_mode=0;
   this->stream = stream;
- 
+
   this->cpu_be        = ( htons(1) == 1 );
 
   return &this->audio_decoder;
@@ -282,7 +282,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_LPCM_BE, BUF_AUDIO_LPCM_LE, 0
 };
 
@@ -292,7 +292,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_DECODER, 16, "pcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_dec/xine_mad_decoder.c b/src/audio_dec/xine_mad_decoder.c
--- a/src/audio_dec/xine_mad_decoder.c
+++ b/src/audio_dec/xine_mad_decoder.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -73,7 +73,7 @@
 
   int64_t           pts;
 
-  struct mad_synth  synth; 
+  struct mad_synth  synth;
   struct mad_stream stream;
   struct mad_frame  frame;
 
@@ -115,7 +115,7 @@
 static void mad_discontinuity (audio_decoder_t *this_gen) {
 
   mad_decoder_t *this = (mad_decoder_t *) this_gen;
-  
+
   this->pts = 0;
 }
 
@@ -165,7 +165,7 @@
 	     buf->size, INPUT_BUF_SIZE-this->bytes_in_buffer);
     buf->size = INPUT_BUF_SIZE-this->bytes_in_buffer;
   }
-  
+
   if ((buf->decoder_flags & BUF_FLAG_HEADER) == 0) {
 
     /* reset decoder on leaving preview mode */
@@ -179,15 +179,15 @@
 
     bytes_in_buffer_at_pts = this->bytes_in_buffer;
 
-    xine_fast_memcpy (&this->buffer[this->bytes_in_buffer], 
+    xine_fast_memcpy (&this->buffer[this->bytes_in_buffer],
                         buf->content, buf->size);
     this->bytes_in_buffer += buf->size;
-    
+
     /*
     printf ("libmad: decode data - doing it\n");
     */
 
-    mad_stream_buffer (&this->stream, this->buffer, 
+    mad_stream_buffer (&this->stream, this->buffer,
 		       this->bytes_in_buffer);
 
     if (this->bytes_in_buffer < MAD_MIN_SIZE)
@@ -211,7 +211,7 @@
 	if (this->stream.next_frame) {
 	  int num_bytes =
 	    this->buffer + this->bytes_in_buffer - this->stream.next_frame;
-	  
+
 	  /* printf("libmad: MAD_ERROR_BUFLEN\n"); */
 
 	  memmove(this->buffer, this->stream.next_frame, num_bytes);
@@ -225,16 +225,16 @@
 	  this->needs_more_data = 1;
 	  return;
 
-	default: 
+	default:
 	  lprintf ("error 0x%04X, mad_stream_buffer %d bytes\n", this->stream.error, this->bytes_in_buffer);
-	  mad_stream_buffer (&this->stream, this->buffer, 
+	  mad_stream_buffer (&this->stream, this->buffer,
 			     this->bytes_in_buffer);
 	}
 
       } else {
 	int mode = (this->frame.header.mode == MAD_MODE_SINGLE_CHANNEL) ? AO_CAP_MODE_MONO : AO_CAP_MODE_STEREO;
 
-	if (!this->output_open 
+	if (!this->output_open
 	    || (this->output_sampling_rate != this->frame.header.samplerate)
 	    || (this->output_mode != mode)) {
 
@@ -250,23 +250,23 @@
           if (! _x_meta_info_get(this->xstream, XINE_META_INFO_AUDIOCODEC)) {
             switch (this->frame.header.layer) {
             case MAD_LAYER_I:
-              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC, 
+              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
                 "MPEG audio layer 1 (lib: MAD)");
               break;
             case MAD_LAYER_II:
-              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC, 
+              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
                 "MPEG audio layer 2 (lib: MAD)");
               break;
             case MAD_LAYER_III:
-              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC, 
+              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
                 "MPEG audio layer 3 (lib: MAD)");
               break;
             default:
-              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC, 
+              _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
                 "MPEG audio (lib: MAD)");
             }
           }
-	  
+
 	  if (this->output_open) {
 	    this->xstream->audio_out->close (this->xstream->audio_out, this->xstream);
 	    this->output_open = 0;
@@ -274,7 +274,7 @@
           if (!this->output_open) {
 	    this->output_open = (this->xstream->audio_out->open) (this->xstream->audio_out,
 				   this->xstream, 16,
-				   this->frame.header.samplerate, 
+				   this->frame.header.samplerate,
 			           mode) ;
           }
           if (!this->output_open) {
@@ -287,7 +287,7 @@
 	mad_synth_frame (&this->synth, &this->frame);
 
 	if ( (buf->decoder_flags & BUF_FLAG_PREVIEW) == 0 ) {
-        
+
 	  unsigned int         nchannels, nsamples;
 	  mad_fixed_t const   *left_ch, *right_ch;
 	  struct mad_pcm      *pcm = &this->synth.pcm;
@@ -323,10 +323,10 @@
 
 	  while (nsamples--) {
 	    /* output sample(s) in 16-bit signed little-endian PCM */
-	    
+
 	    *output++ = scale(*left_ch++);
-	    
-	    if (nchannels == 2) 
+
+	    if (nchannels == 2)
 	      *output++ = scale(*right_ch++);
 
 	  }
@@ -371,13 +371,13 @@
 
 static void mad_dispose (audio_decoder_t *this_gen) {
 
-  mad_decoder_t *this = (mad_decoder_t *) this_gen; 
+  mad_decoder_t *this = (mad_decoder_t *) this_gen;
 
   mad_synth_finish (&this->synth);
   mad_frame_finish (&this->frame);
   mad_stream_finish(&this->stream);
 
-  if (this->output_open) { 
+  if (this->output_open) {
     this->xstream->audio_out->close (this->xstream->audio_out, this->xstream);
     this->output_open = 0;
   }
@@ -408,7 +408,7 @@
 
   this->stream.options = MAD_OPTION_IGNORECRC;
 
-  lprintf ("init\n"); 
+  lprintf ("init\n");
 
   return &this->audio_decoder;
 }
@@ -419,7 +419,7 @@
 static void *init_plugin (xine_t *xine, void *data) {
 
   mad_class_t *this;
-  
+
   this = (mad_class_t *) calloc(1, sizeof(mad_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
@@ -430,7 +430,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_MPEG, 0
 };
 
@@ -440,7 +440,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_DECODER, 16, "mad", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_dec/xine_musepack_decoder.c b/src/audio_dec/xine_musepack_decoder.c
--- a/src/audio_dec/xine_musepack_decoder.c
+++ b/src/audio_dec/xine_musepack_decoder.c
@@ -88,10 +88,10 @@
 #else
   mpc_demux       *decoder;
 #endif
-  
+
   int              decoder_ok;
   unsigned int     current_frame;
-  
+
   int32_t          file_size;
 
 } mpc_decoder_t;
@@ -100,26 +100,26 @@
 /**************************************************************************
  * musepack specific functions
  *************************************************************************/
-    
+
 /* Reads size bytes of data into buffer at ptr. */
 static int32_t mpc_reader_read(void *const data, void *const ptr, int size) {
   mpc_decoder_t *const this = (mpc_decoder_t *) data;
-  
+
   lprintf("mpc_reader_read: size=%d\n", size);
-  
+
   /* Don't try to read more data than we have */
   if (size > (this->size - this->read))
     size = this->size - this->read;
 
   /* Copy the data */
   xine_fast_memcpy(ptr, &this->buf[this->read], size);
-  
+
   /* Update our position in the data buffer */
   this->read += size;
-  
+
   return size;
 }
- 
+
 /* Seeks to byte position offset. */
 #ifndef HAVE_MPC_MPCDEC_H
 static mpc_bool_t mpc_reader_seek(void *const data, const int32_t offset) {
@@ -128,13 +128,13 @@
 static mpc_bool_t mpc_reader_seek(mpc_reader *data, int32_t offset) {
   mpc_decoder_t *const this = (mpc_decoder_t *) data->data;
 #endif
-  
+
   lprintf("mpc_reader_seek: offset=%d\n", offset);
-  
+
   /* seek is only called when reading the header so we can assume
    * that the buffer starts at the start of the file */
   this->read = offset;
-  
+
 #ifndef HAVE_MPC_MPCDEC_H
   return TRUE;
 #else
@@ -149,7 +149,7 @@
 static int32_t mpc_reader_tell(mpc_reader *const data) {
 #endif
   lprintf("mpc_reader_tell\n");
-  
+
   /* Tell isn't used so just return 0 */
   return 0;
 }
@@ -162,9 +162,9 @@
 static int32_t mpc_reader_get_size(mpc_reader *const data) {
   mpc_decoder_t *const this = (mpc_decoder_t *) data->data;
 #endif
-  
+
   lprintf("mpc_reader_get_size\n");
-  
+
   return this->file_size;
 }
 
@@ -172,7 +172,7 @@
 #ifndef HAVE_MPC_MPCDEC_H
 static mpc_bool_t mpc_reader_canseek(void *data) {
   lprintf("mpc_reader_canseek\n");
-  
+
   return TRUE;
 #else
 static mpc_bool_t mpc_reader_canseek(mpc_reader *data) {
@@ -213,9 +213,9 @@
 #ifdef HAVE_MPC_MPCDEC_H
   mpc_frame_info frame;
 #endif
-  
+
   lprintf("mpd_decode_frame\n");
-  
+
 #ifndef HAVE_MPC_MPCDEC_H
   frames = mpc_decoder_decode(&this->decoder, buffer, 0, 0);
 #else
@@ -223,26 +223,26 @@
   mpc_demux_decode(this->decoder, &frame);
   frames = frame.samples;
 #endif
-  
+
   if (frames > 0) {
-    audio_buffer_t *audio_buffer;  
+    audio_buffer_t *audio_buffer;
     int16_t  *int_samples;
-    
+
     lprintf("got %d samples\n", frames);
-    
+
     /* Get audio buffer */
     audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
     audio_buffer->vpts = 0;
     audio_buffer->num_frames = frames;
-    
[... 123 lines omitted ...]
-    
+
   /* If we run out of space in our internal buffer we discard what's
    * already been read */
   if (((this->size + buf->size) > this->buf_max) && this->read) {
@@ -362,7 +362,7 @@
     memmove(this->buf, &this->buf[this->read], this->size);
     this->read = 0;
   }
-  
+
   /* If there still isn't space we have to increase the size of the
    * internal buffer */
   if ((this->size + buf->size) > this->buf_max) {
@@ -371,11 +371,11 @@
     this->buf_max += 2*buf->size;
     this->buf = realloc(this->buf, this->buf_max);
   }
-  
+
   /* Copy data */
   xine_fast_memcpy(&this->buf[this->size], buf->content, buf->size);
   this->size += buf->size;
-  
+
   /* Time to decode */
   if (buf->decoder_flags & BUF_FLAG_FRAME_END)  {
     /* Increment frame count */
@@ -388,45 +388,45 @@
               _("libmusepack: data after last frame ignored\n"));
       return;
     }
-  
+
     if (!this->decoder_ok) {
       /* We require MPC_DECODER_MEMSIZE bytes to initialise the decoder */
       if ((this->size - this->read) >= MPC_DECODER_MEMSIZE) {
         lprintf("initialise");
-      
+
 #ifndef HAVE_MPC_MPCDEC_H
         if (!mpc_decoder_initialize(&this->decoder, &this->streaminfo)) {
 #else
         if (!this->decoder) {
 #endif
           xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                  _("libmusepack: mpc_decoder_initialise failed\n"));        
-          
+                  _("libmusepack: mpc_decoder_initialise failed\n"));
+
           _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
           return;
         }
-        
+
         this->decoder_ok = 1;
       } else {
         /* Not enough data yet */
         return;
       }
     }
-    
+
     /* mpc_decoder_decode may cause a read of MPC_DECODER_MEMSIZE/2 bytes so
      * make sure we have enough data available */
     if ((this->size - this->read) >= MPC_DECODER_MEMSIZE2) {
       lprintf("decoding\n");
-    
+
       if ((err = mpc_decode_frame(this)) < 0) {
         xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                _("libmusepack: mpc_decoder_decode failed: %d\n"), err);        
-          
+                _("libmusepack: mpc_decoder_decode failed: %d\n"), err);
+
         _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
         return;
       }
     }
-    
+
     /* If we are at the end of the stream we decode the remaining frames as we
      * know we'll have enough data */
 #ifndef HAVE_MPC_MPCDEC_H
@@ -435,14 +435,14 @@
     if (this->current_frame == this->streaminfo.samples) {
 #endif
       lprintf("flushing buffers\n");
-      
+
       do {
         if ((err = mpc_decode_frame(this)) < 0) {
           xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
                   _("libmusepack: mpc_decoder_decode failed: %d\n"), err);
         }
       } while (err > 0);
-      
+
       lprintf("buffers flushed\n");
     }
   }
@@ -474,7 +474,7 @@
   if (this->decoder)
     mpc_demux_exit(this->decoder);
 #endif
-  
+
   free(this);
 }
 
@@ -495,7 +495,7 @@
 
   /* audio output is not open at the start */
   this->output_open = 0;
-  
+
   /* no buffer yet */
   this->buf = NULL;
 
@@ -522,7 +522,7 @@
   return this;
 }
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_MPC,
   0
 };

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -7,7 +7,7 @@
 ##
 # IMPORTANT:
 # ---------
-# all xine audio out plugins should be named like the 
+# all xine audio out plugins should be named like the
 # scheme "xineplug_ao_out_"
 #
 
@@ -86,14 +86,14 @@
 xineplug_ao_out_alsa_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
 xineplug_ao_out_alsa_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 
-xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c 
+xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c
 xineplug_ao_out_esd_la_LIBADD = $(XINE_LIB) $(ESD_LIBS) $(LTLIBINTL)
 xineplug_ao_out_esd_la_CFLAGS = $(AM_CFLAGS) $(ESD_CFLAGS)
 
 xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
 xineplug_ao_out_sun_la_LIBADD = $(XINE_LIB)
 
-#xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c 
+#xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c
 #xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
 #xineplug_ao_out_irixal_la_CFLAGS = $(AM_CFLAGS) $(IRIXAL_CFLAGS)
 
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1,23 +1,23 @@
-/* 
+/*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * Credits go 
+ * Credits go
  * - for the SPDIF A/52 sync part
  * - frame size calculation added (16-08-2001)
  * (c) 2001 Andy Lo A Foe <andy@...>
@@ -99,7 +99,7 @@
   uint32_t           bytes_per_frame;
   uint32_t           bytes_in_buffer;      /* number of bytes writen to audio hardware   */
   snd_pcm_uframes_t  buffer_size;
-  int32_t            mmap; 
+  int32_t            mmap;
 
   struct {
     pthread_t          thread;
@@ -136,10 +136,10 @@
 
   if (count < 0)
     return count;
-  
+
   if ((unsigned int) count > sizeof(spfds) / sizeof(spfds[0])) {
     pfds = calloc(count, sizeof(*pfds));
-    
+
     if (!pfds)
       return -ENOMEM;
 
@@ -169,44 +169,44 @@
       int old_mute;
 
       pthread_mutex_lock(&this->mixer.mutex);
-      
+
       old_mute = (this->mixer.mute & MIXER_MASK_MUTE) ? 1 : 0;
 
       if((err = snd_mixer_handle_events(this->mixer.handle)) < 0) {
-	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 		"audio_alsa_out: snd_mixer_handle_events(): %s\n",  snd_strerror(err));
 	pthread_mutex_unlock(&this->mixer.mutex);
 	continue;
       }
-      
+
       if((err = snd_mixer_selem_get_playback_volume(this->mixer.elem, SND_MIXER_SCHN_FRONT_LEFT, &left_vol)) < 0) {
-	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 		"audio_alsa_out: snd_mixer_selem_get_playback_volume(): %s\n",  snd_strerror(err));
 	pthread_mutex_unlock(&this->mixer.mutex);
 	continue;
       }
-      
+
       if((err = snd_mixer_selem_get_playback_volume(this->mixer.elem, SND_MIXER_SCHN_FRONT_RIGHT, &right_vol)) < 0) {
-	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 		"audio_alsa_out: snd_mixer_selem_get_playback_volume(): %s\n",  snd_strerror(err));
 	pthread_mutex_unlock(&this->mixer.mutex);
 	continue;
       }
-      
+
       if(this->mixer.mute & MIXER_HAS_MUTE_SWITCH) {
-	
+
 	if(this->mixer.mute & MIXER_MASK_STEREO) {
 	  snd_mixer_selem_get_playback_switch(this->mixer.elem, SND_MIXER_SCHN_FRONT_LEFT, &swl);
 	  mute = (swl) ? 0 : 1;
 	}
 	else {
-	  
+
 	  if (this->mixer.mute & MIXER_MASK_LEFT)
 	    snd_mixer_selem_get_playback_switch(this->mixer.elem, SND_MIXER_SCHN_FRONT_LEFT, &swl);
-	  
+
 	  if ((SND_MIXER_SCHN_FRONT_RIGHT != SND_MIXER_SCHN_UNKNOWN) && (this->mixer.mute & MIXER_MASK_RIGHT))
 	    snd_mixer_selem_get_playback_switch(this->mixer.elem, SND_MIXER_SCHN_FRONT_RIGHT, &swr);
-	  
+
 	  mute = (swl || swr) ? 0 : 1;
 	}
       }
@@ -216,26 +216,26 @@
 	xine_audio_level_data_t   data;
 	xine_stream_t            *stream;
 	xine_list_iterator_t      ite;
-	
+
 	this->mixer.right_vol = right_vol;
 	this->mixer.left_vol  = left_vol;
 	if(mute)
 	  this->mixer.mute |= MIXER_MASK_MUTE;
 	else
 	  this->mixer.mute &= ~MIXER_MASK_MUTE;
-	
-	data.right = ao_alsa_get_percent_from_volume(this->mixer.right_vol, 
+
+	data.right = ao_alsa_get_percent_from_volume(this->mixer.right_vol,
 						     this->mixer.min, this->mixer.max);
[... 743 lines omitted ...]
 }
 
 static void alsa_speaker_arrangement_cb (void *user_data,
-                                  xine_cfg_entry_t *entry); 
+                                  xine_cfg_entry_t *entry);
 
 /*
  * Initialize plugin
@@ -1358,8 +1358,8 @@
 
   err = snd_lib_error_set_handler(error_callback);
   if(err < 0)
-    xine_log(this->class->xine, XINE_LOG_MSG, _("snd_lib_error_set_handler() failed: %d"), err); 
-  
+    xine_log(this->class->xine, XINE_LOG_MSG, _("snd_lib_error_set_handler() failed: %d"), err);
+
   snd_pcm_hw_params_alloca(&params);
 
   this->mmap = config->register_bool (config,
@@ -1424,7 +1424,7 @@
 
   /* Use the default device to open first */
   pcm_device = config->lookup_entry(config, "audio.device.alsa_default_device")->str_value;
- 
+
   /*
    * find best device driver/channel
    */
@@ -1434,11 +1434,11 @@
   err=snd_pcm_open(&this->audio_fd, pcm_device, SND_PCM_STREAM_PLAYBACK, 1); /* NON-BLOCK mode */
   if(err <0 ) {
     xine_log (this->class->xine, XINE_LOG_MSG,
-          _("snd_pcm_open() failed:%d:%s\n"), err, snd_strerror(err)); 
+          _("snd_pcm_open() failed:%d:%s\n"), err, snd_strerror(err));
     xine_log (this->class->xine, XINE_LOG_MSG,
-          _(">>> Check if another program already uses PCM <<<\n")); 
+          _(">>> Check if another program already uses PCM <<<\n"));
     free(this);
-    return NULL; 
+    return NULL;
   }
 
   /*
@@ -1446,7 +1446,7 @@
    */
   err = snd_pcm_hw_params_any(this->audio_fd, params);
   if (err < 0) {
-    xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->class->xine, XINE_VERBOSITY_DEBUG,
 	     "audio_alsa_out: broken configuration for this PCM: no configurations available\n");
     snd_pcm_close(this->audio_fd);
     free(this);
@@ -1455,7 +1455,7 @@
   err = snd_pcm_hw_params_set_access(this->audio_fd, params,
                                      SND_PCM_ACCESS_RW_INTERLEAVED);
   if (err < 0) {
-    xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->class->xine, XINE_VERBOSITY_DEBUG,
 	     "audio_alsa_out: access type not available");
     snd_pcm_close(this->audio_fd);
     free(this);
@@ -1537,31 +1537,31 @@
      ( speakers == SURROUND4 )) {
     this->capabilities |= AO_CAP_MODE_4CHANNEL;
     xine_strcat_realloc (&logmsg, _(" 4-channel"));
-  } 
+  }
   else
     xine_strcat_realloc (&logmsg, _(" (4-channel not enabled in xine config)"));
-  
-  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
+
+  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) &&
      ( speakers == SURROUND41 )) {
     this->capabilities |= AO_CAP_MODE_4_1CHANNEL;
     xine_strcat_realloc (&logmsg, _(" 4.1-channel"));
-  } 
+  }
   else
     xine_strcat_realloc (&logmsg, _(" (4.1-channel not enabled in xine config)"));
 
-  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
+  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) &&
      ( speakers == SURROUND5 )) {
     this->capabilities |= AO_CAP_MODE_5CHANNEL;
     xine_strcat_realloc (&logmsg, _(" 5-channel"));
-  } 
+  }
   else
     xine_strcat_realloc (&logmsg, _(" (5-channel not enabled in xine config)"));
 
-  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
+  if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) &&
      ( speakers >= SURROUND51 )) {
     this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
     xine_strcat_realloc (&logmsg, _(" 5.1-channel"));
-  } 
+  }
   else
     xine_strcat_realloc (&logmsg, _(" (5.1-channel not enabled in xine config)"));
 
@@ -1587,7 +1587,7 @@
     this->capabilities |= AO_CAP_MODE_A52;
     this->capabilities |= AO_CAP_MODE_AC5;
     xine_strcat_realloc (&logmsg, _(" a/52 and DTS pass-through"));
-  } 
+  }
   else
     xine_strcat_realloc (&logmsg, _(" (a/52 and DTS pass-through not enabled in xine config)"));
 
@@ -1622,7 +1622,7 @@
   this->ao_driver.num_channels        = ao_alsa_num_channels;
   this->ao_driver.bytes_per_frame     = ao_alsa_bytes_per_frame;
   this->ao_driver.delay               = ao_alsa_delay;
-  this->ao_driver.write	 	      = ao_alsa_write;
+  this->ao_driver.write		      = ao_alsa_write;
   this->ao_driver.close               = ao_alsa_close;
   this->ao_driver.exit                = ao_alsa_exit;
   this->ao_driver.get_gap_tolerance   = ao_alsa_get_gap_tolerance;
@@ -1695,7 +1695,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_ALSA_IFACE_VERSION, "alsa", XINE_VERSION_CODE, &ao_info_alsa, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -54,7 +54,7 @@
 
 #define AO_OUT_COREAUDIO_IFACE_VERSION 9
 
-#define GAP_TOLERANCE        AO_MAX_GAP 
+#define GAP_TOLERANCE        AO_MAX_GAP
 #define BUFSIZE              30720
 /* Number of seconds to wait for buffered data to arrive/be used
  * before giving up. */
@@ -75,7 +75,7 @@
 
   Component      au_component;
   Component      converter_component;
- 
+
   AudioUnit      au_unit;
   AudioUnit      converter_unit;
 
@@ -86,7 +86,7 @@
 
   int            mute;
   Float32        pre_mute_volume;
-  
+
   pthread_mutex_t mutex;
   pthread_cond_t  buffer_ready_for_reading;
   pthread_cond_t  buffer_ready_for_writing;
@@ -131,7 +131,7 @@
       pthread_mutex_lock (&this->mutex);
       if(this->buf_head < ((BUFSIZE) >> 2)) {
         set_to_future(&future);
-        if(pthread_cond_timedwait 
+        if(pthread_cond_timedwait
              (&this->buffer_ready_for_reading, &this->mutex, &future) == ETIMEDOUT)
         {
           /* Timed out, give up and fill remainder with silence. */
@@ -143,13 +143,13 @@
           return noErr;
         }
       }
-      
+
       if(this->buf_head < buffer_size - buffer_progress) {
         chunk_size = this->buf_head;
       } else {
         chunk_size = buffer_size - buffer_progress;
       }
-    
+
       xine_fast_memcpy (ioData->mBuffers[i].mData, this->buf, chunk_size);
       if(chunk_size < this->buf_head) {
         memmove(this->buf, &(this->buf[chunk_size]), this->buf_head - chunk_size);
@@ -188,7 +188,7 @@
   AudioStreamBasicDescription format;
   AudioUnitConnection connection;
   ComponentDescription desc;
-  
+
   switch (mode) {
   case AO_CAP_MODE_MONO:
     this->num_channels = 1;
@@ -209,7 +209,7 @@
   pthread_cond_init (&this->buffer_ready_for_reading, NULL);
   pthread_cond_init (&this->buffer_ready_for_writing, NULL);
 
-  xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG,
            "audio_coreaudio_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode);
 
   /* find an audio output unit */
@@ -218,17 +218,17 @@
   desc.componentManufacturer = kAudioUnitManufacturer_Apple;
   desc.componentFlags = 0;
   desc.componentFlagsMask = 0;
-                  
+
   this->au_component = FindNextComponent (NULL, &desc);
 
   if (this->au_component == NULL) {
-      xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
                "audio_coreaudio_out: Unable to find a usable audio output unit component\n");
       return 0;
   }
-  
+
   OpenAComponent (this->au_component, &this->au_unit);
-  
+
   /* find a converter unit */
   desc.componentType = kAudioUnitType_FormatConverter;
   desc.componentSubType = kAudioUnitSubType_AUConverter;
@@ -236,11 +236,11 @@
   this->converter_component = FindNextComponent (NULL, &desc);
 
   if (this->converter_component == NULL) {
-      xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
                "audio_coreaudio_out: Unable to find a usable audio converter unit component\n");
       return 0;
   }
-  
+
   OpenAComponent (this->converter_component, &this->converter_unit);
 
   /* set up the render procedure */
@@ -258,7 +258,7 @@
   connection.destInputNumber = 0;
   AudioUnitSetProperty (this->au_unit,
                         kAudioUnitProperty_MakeConnection,
-                        kAudioUnitScope_Input, 0, 
+                        kAudioUnitScope_Input, 0,
                         &connection, sizeof(connection));
 
   /* set up the audio format we want to use */
@@ -274,7 +274,7 @@
   format.mBytesPerFrame    = this->bytes_per_frame;
   format.mFramesPerPacket  = 1;
   format.mBytesPerPacket   = format.mBytesPerFrame;
- 
+
   AudioUnitSetProperty (this->converter_unit,
                         kAudioUnitProperty_StreamFormat,
                         kAudioUnitScope_Input,
@@ -339,7 +339,7 @@
     pthread_mutex_lock (&this->mutex);
     if(this->buf_head > ((3 * BUFSIZE)>>2)) {
       set_to_future(&future);
-      if(pthread_cond_timedwait 
+      if(pthread_cond_timedwait
            (&this->buffer_ready_for_writing, &this->mutex, &future) == ETIMEDOUT)
       {
         /* Timed out, give up. */
@@ -354,10 +354,10 @@
     } else {
       chunk_size = remaining_bytes;
     }
-    
+
     xine_fast_memcpy(&(this->buf[this->buf_head]), data, chunk_size);
     this->buf_head += chunk_size;
-    remaining_bytes -= chunk_size; 
+    remaining_bytes -= chunk_size;
 
     if(this->buf_head > 0) {
       pthread_cond_broadcast (&this->buffer_ready_for_reading);
@@ -389,13 +389,13 @@
       CloseComponent (this->au_unit);
       this->au_unit = 0;
   }
-  
+
   if (this->converter_unit) {
       AudioUnitUninitialize (this->converter_unit);
       CloseComponent (this->converter_unit);
       this->converter_unit = 0;
   }
-  
+
   if (this->au_component) {
       this->au_component = NULL;
   }
@@ -417,7 +417,7 @@
 static void ao_coreaudio_exit(ao_driver_t *this_gen)
 {
   coreaudio_driver_t *this = (coreaudio_driver_t *) this_gen;
-  
+
   ao_coreaudio_close(this_gen);
 
   free (this);
@@ -436,7 +436,7 @@
                                kAudioUnitScope_Output,
                                0, &val);
 	} else {
-	  val = this->pre_mute_volume;	
+	  val = this->pre_mute_volume;
 	}
         return (int) (val * 12);
 	break;
@@ -472,12 +472,12 @@
                             kHALOutputParam_Volume,
                             kAudioUnitScope_Output,
                             0, &(this->pre_mute_volume));
-            
+
             AudioUnitSetParameter (this->au_unit,
                             kHALOutputParam_Volume,
                             kAudioUnitScope_Output,
                             0, 0, 0);
-            
+
             this->mute = 1;
           }
         } else {
@@ -487,14 +487,14 @@
                             kHALOutputParam_Volume,
                             kAudioUnitScope_Output,
                             0, this->pre_mute_volume, 0);
-            
+
             this->mute = 0;
           }
 	}
 	return value;
 	break;
   }
-  
+
   return ~value;
 }
 
@@ -521,7 +521,7 @@
   return 0;
 }
 
-static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, 
+static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
                                  const void *data) {
 
   coreaudio_class_t     *class = (coreaudio_class_t *) class_gen;
@@ -590,7 +590,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_COREAUDIO_IFACE_VERSION, "coreaudio", XINE_VERSION_CODE, &ao_info_coreaudio, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -69,14 +69,14 @@
 
 /*
  * If GAP_TOLERANCE is lower than AO_MAX_GAP, xine will
- * try to smooth playback without skipping frames or 
+ * try to smooth playback without skipping frames or
  * inserting silence.
  */
 #define GAP_TOLERANCE        (AO_MAX_GAP/3)
 
-/* 
- * buffer size in miliseconds 
- * (one second takes 11-192 KB) 
+/*
+ * buffer size in miliseconds
+ * (one second takes 11-192 KB)
  */
 #define BUFFER_MS 1000
 
@@ -85,7 +85,7 @@
  */
 #define BUFFER_MIN_MS 200
 
-/* 
+/*
  * base power factor for volume remapping
  */
 #define FACTOR 60.0
@@ -116,8 +116,8 @@
   LPDIRECTSOUNDBUFFER dsbuffer;    /* DirectSound buffer */
 
   size_t buffer_size;              /* size of the buffer */
-  size_t write_pos;                /* positition in ring buffer for writing*/ 
-	
+  size_t write_pos;                /* positition in ring buffer for writing*/
+
   int status;                      /* current status of the driver */
   int paused;                      /* paused mode */
   int finished;                    /* driver finished */
@@ -355,7 +355,7 @@
 }
 
 
-/* 
+/*
  * set the volume
  *
  * DirecSound can only lower the volume by software way.
@@ -402,7 +402,7 @@
 
   // this->read_size += size;
   this->write_pos = (this->write_pos + size ) % this->buffer_size;
-  lprintf("size %u, write_pos %u\n", size, this->write_pos);	
+  lprintf("size %u, write_pos %u\n", size, this->write_pos);
 
   if ((err = IDirectSoundBuffer_Unlock(this->dsbuffer, ptr1, size1, ptr2, size2)) != DS_OK) {
     audio_error(this, err, _("Couldn't unlock direct sound buffer"));
@@ -466,8 +466,8 @@
 }
 
 
-/* 
- * test capabilities of driver before opening 
+/*
+ * test capabilities of driver before opening
  *
  * Passed only 8 bit and 16 bit with mono or stereo.
  */
@@ -516,7 +516,7 @@
 
 /* size of free space in the ring buffer */
 static size_t buffer_free_size(dx2_driver_t *this) {
-	
+
   int ret;
   size_t play_pos;
 	size_t free_space;
@@ -525,10 +525,10 @@
 	ret = audio_tell(this, &play_pos);
 	if (!ret)
 		return 0;
-	
+
 	// calc free space (-1)
 	free_space = (this->buffer_size + play_pos - this->write_pos - 1) % this->buffer_size;
-	
+
 	return free_space;
 }
 
@@ -542,10 +542,10 @@
   // get current play pos
 	ret = audio_tell(this, &play_pos);
 	if (!ret) return 0;
-	
+
 	// calc used space
 	used_space = (this->buffer_size + this->write_pos - play_pos) % this->buffer_size;
-	
+
 	return used_space;
 }
 
@@ -758,7 +758,7 @@
     if (ret){
       frames = buffer_occupied_size(this) / this->frame_size;
     }
-  }	
+  }
 
   pthread_mutex_unlock(&this->data_mutex);
 
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2001-2003 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -81,14 +81,14 @@
   int			capabilities;
 
   xine_t               *xine;
-  
+
   /* directx objects */
   LPDIRECTSOUND         dsobj;
   LPDIRECTSOUNDBUFFER   dsbuffer;
   DSBCAPS		dsbcaps;
   LPDIRECTSOUNDNOTIFY   notify;
   DSBPOSITIONNOTIFY	notify_events[ 2 ];
-  
+
   /* buffer vars */
   long                  buffer_size;
   int                   write_status;
@@ -96,13 +96,13 @@
 
   uint8_t               prebuff[ SOUND_BUFFER_MAX ];
   uint32_t              prebuff_size;
-  
+
   /* current buffer properties */
   int		        bits;
   int		        rate;
   int		        chnn;
   int		        frsz;
-  
+
   /* current mixer settings */
   int                   mute;
   int		        volume;
@@ -118,7 +118,7 @@
  *
  * BEGIN : Direct Sound and win32 handlers
  *         for xine audio output plugins.
- * 
+ *
  * ------------------------------------------- */
 
 void       Error( HWND hwnd, LPSTR szfmt, ... );
@@ -128,7 +128,7 @@
 void       DestroySoundBuffer( ao_directx_t * ao_directx );
 uint32_t   FillSoundBuffer( ao_directx_t * ao_directx, int code, unsigned char * samples );
 
-/* Display formatted error message in 
+/* Display formatted error message in
  * popup message box. */
 
 void Error( HWND hwnd, LPSTR szfmt, ... )
@@ -229,25 +229,25 @@
    * related resources */
 
   DestroySoundBuffer( ao_directx );
-	
+
   /* create a secondary sound buffer */
-	
-  memset( &pcmwf, 0, sizeof( PCMWAVEFORMAT ) ); 
+
+  memset( &pcmwf, 0, sizeof( PCMWAVEFORMAT ) );
   pcmwf.wBitsPerSample     = ( unsigned short ) ao_directx->bits;
-  pcmwf.wf.wFormatTag      = WAVE_FORMAT_PCM; 
+  pcmwf.wf.wFormatTag      = WAVE_FORMAT_PCM;
   pcmwf.wf.nChannels       = ao_directx->chnn;
-  pcmwf.wf.nSamplesPerSec  = ao_directx->rate; 
+  pcmwf.wf.nSamplesPerSec  = ao_directx->rate;
   pcmwf.wf.nBlockAlign     = ao_directx->frsz;
-  pcmwf.wf.nAvgBytesPerSec = ao_directx->rate * ao_directx->frsz; 
+  pcmwf.wf.nAvgBytesPerSec = ao_directx->rate * ao_directx->frsz;
 
-  memset( &dsbdesc, 0, sizeof( DSBUFFERDESC ) ); 
-  dsbdesc.dwSize        = sizeof( DSBUFFERDESC ); 
-  dsbdesc.dwFlags       = (DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS | 
+  memset( &dsbdesc, 0, sizeof( DSBUFFERDESC ) );
+  dsbdesc.dwSize        = sizeof( DSBUFFERDESC );
+  dsbdesc.dwFlags       = (DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS |
 			   DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY);
   dsbdesc.dwBufferBytes = ao_directx->buffer_size;
   dsbdesc.lpwfxFormat   = ( LPWAVEFORMATEX ) &pcmwf;
 
-  if( IDirectSound_CreateSoundBuffer( ao_directx->dsobj, &dsbdesc, 
+  if( IDirectSound_CreateSoundBuffer( ao_directx->dsobj, &dsbdesc,
 				      &ao_directx->dsbuffer, 0 ) != DS_OK )
     {
       Error( 0, "IDirectSound_CreateSoundBuffer : Unable to create secondary sound buffer" );
@@ -282,7 +282,7 @@
   /* get the direct sound notification interface */
 
   if( IDirectSoundBuffer_QueryInterface( ao_directx->dsbuffer,
-					 &IID_IDirectSoundNotify, 
+					 &IID_IDirectSoundNotify,
 					 (LPVOID *)&ao_directx->notify ) != DS_OK )
     {
       Error( 0, "IDirectSoundBuffer_QueryInterface : Unable to get notification interface" );
@@ -380,9 +380,9 @@
 
 #ifdef LOG
   if ((void*)samples != (void*)0)
-    printf("audio_directx_out: FillSoundBuffer(%08x, %d, Null) Enter\n", (unsigned long)ao_directx, code);	
+    printf("audio_directx_out: FillSoundBuffer(%08x, %d, Null) Enter\n", (unsigned long)ao_directx, code);
   else
-    printf("audio_directx_out: FillSoundBuffer(%08x, %d, Null) Enter\n", (unsigned long)ao_directx, code);	
+    printf("audio_directx_out: FillSoundBuffer(%08x, %d, Null) Enter\n", (unsigned long)ao_directx, code);
 #endif
 
   half_size = ao_directx->buffer_size / 2;
@@ -485,7 +485,7 @@
 	}
 
       /* write data to our sound buffer */
-	
+
       memcpy( buff_pointer, samples, buff_length );
 
       /* unlock our sound buffer */
@@ -512,7 +512,7 @@
  * ----------------------------------------- */
 
 static int ao_directx_control(ao_driver_t *this_gen, int cmd, ...) {
-  switch (cmd) 
+  switch (cmd)
     {
 
     case AO_CTRL_PLAY_PAUSE:
@@ -539,7 +539,7 @@
 
   ao_directx->bits = bits;
   ao_directx->rate = rate;
-	
+
   /* store channel count */
 
   switch( mode )
@@ -628,7 +628,7 @@
   uint32_t	 wrote;	        /* number of bytes written */
   uint32_t	 half_size;     /* half our sound buffer size */
 
-  lprintf("ao_directx_write(%08x, %08x, %d) Enter\n", 
+  lprintf("ao_directx_write(%08x, %08x, %d) Enter\n",
 	  (unsigned long)ao_directx, (unsigned long)frame_buffer, num_frames);
 
   /* zero write counter */
@@ -745,7 +745,7 @@
 {
   ao_directx_t  *ao_directx = ( ao_directx_t * ) ao_driver;
 
-  lprintf("ao_directx_set_property(%08x, %d, %d) Enter\n", 
+  lprintf("ao_directx_set_property(%08x, %d, %d) Enter\n",
 	  (unsigned long)ao_directx, property, value);
 
   switch( property )
@@ -759,7 +759,7 @@
       if( !ao_directx->mute && ao_directx->dsbuffer )
 	IDirectSoundBuffer_SetVolume( ao_directx->dsbuffer, ao_directx->volume );
 
-      xprintf(ao_directx->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(ao_directx->xine, XINE_VERBOSITY_DEBUG,
 	      "ao_directx : volume set to %d - directX volume = %d\n", value, ao_directx->volume);
 
       return value;
@@ -793,11 +793,11 @@
 {
   audiox_class_t  *class = (audiox_class_t *) class_gen;
   ao_directx_t    *ao_directx;
-  
+
   ao_directx = calloc(1, sizeof(ao_directx_t));
   if (!ao_directx)
     return NULL;
-  
+
   lprintf("open_plugin(%08x, %08x) Enter\n", (unsigned long)class_gen, (unsigned long)data);
   lprintf("open_plugin: ao_directx=%08x\n", (unsigned long)ao_directx);
 
@@ -834,7 +834,7 @@
   audiox = calloc(1, sizeof (audiox_class_t));
   if (!audiox)
     return NULL;
-  
+
   audiox->driver_class.open_plugin     = open_plugin;
   audiox->driver_class.identifier      = "DirectX";
   audiox->driver_class.description     = N_("xine audio output plugin for win32 using directx");
@@ -844,7 +844,7 @@
   audiox->config                       = xine->config;
 
   lprintf("init_class() Exit! Returning audiox=%08x\n", audiox);
-  
+
   return audiox;
 }
 
@@ -856,7 +856,7 @@
  * exported plugin catalog entry
  */
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_DIRECTX_IFACE_VERSION, "directx", XINE_VERSION_CODE, &ao_info_directx, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -77,7 +77,7 @@
   /*
    * Temporary sample buffer used to reblock the sample output stream
    * to writes using buffer sizes of n*ESD_BUF_SIZE bytes.
-   * 
+   *
    * The reblocking avoids a bug with esd 0.2.18 servers and reduces
    * cpu load with newer versions of the esd server.
    *
@@ -99,7 +99,7 @@
 
 
 /*
- * connect to esd 
+ * connect to esd
  */
 static int ao_esd_open(ao_driver_t *this_gen,
 		       uint32_t bits, uint32_t rate, int mode)
@@ -107,7 +107,7 @@
   esd_driver_t *this = (esd_driver_t *) this_gen;
   esd_format_t     format;
 
-  xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 	   "audio_esd_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode);
 
   if ( (mode & this->capabilities) == 0 ) {
@@ -117,12 +117,12 @@
 
   if (this->audio_fd>=0) {
 
-    if ( (mode == this->mode) && (rate == this->input_sample_rate) ) 
+    if ( (mode == this->mode) && (rate == this->input_sample_rate) )
       return this->output_sample_rate;
 
     esd_close (this->audio_fd);
   }
-  
+
   this->mode                   = mode;
   this->input_sample_rate      = rate;
   this->output_sample_rate     = rate;
@@ -170,7 +170,7 @@
   return this->output_sample_rate;
 }
 
-static int ao_esd_num_channels(ao_driver_t *this_gen) 
+static int ao_esd_num_channels(ao_driver_t *this_gen)
 {
   esd_driver_t *this = (esd_driver_t *) this_gen;
   return this->num_channels;
@@ -200,14 +200,14 @@
   frames += (tv.tv_sec - this->start_time.tv_sec)
     * this->output_sample_rate;
 
-  frames -= this->latency; 
+  frames -= this->latency;
   if (frames < 0)
       frames = 0;
-  
+
   /* calc delay */
-  
+
   bytes_left = this->bytes_in_buffer - frames * this->bytes_per_frame;
-  
+
   if (bytes_left<=0) /* buffer ran dry */
     bytes_left = 0;
   return bytes_left / this->bytes_per_frame;
@@ -230,18 +230,18 @@
   /* check if simulated buffer ran dry */
 
   gettimeofday(&tv, NULL);
-  
+
   frames  = (tv.tv_usec - this->start_time.tv_usec)
     * this->output_sample_k_rate / 1000;
   frames += (tv.tv_sec - this->start_time.tv_sec)
     * this->output_sample_rate;
-  
-  frames -= this->latency; 
+
+  frames -= this->latency;
   if (frames < 0)
       frames = 0;
 
   /* calc delay */
-  
+
   simulated_bytes_in_buffer = frames * this->bytes_per_frame;
 
   if (this->bytes_in_buffer < simulated_bytes_in_buffer)
@@ -296,7 +296,7 @@
     if (nwritten != num_bytes) {
 	if (nwritten < 0)
 	  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_esd_out: writev failed: %s\n", strerror(errno));
-	else 
+	else
 	  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_esd_out: warning, incomplete write: %d\n", nwritten);
     }
[... 19 lines omitted ...]
+
     if((mixer_fd = esd_open_sound(NULL)) >= 0) {
       if((esd_i = esd_get_all_info(mixer_fd)) != NULL) {
 	for(esd_pi = esd_i->player_list; esd_pi != NULL; esd_pi = esd_pi->next) {
 	  if(!strcmp(this->pname, esd_pi->name)) {
 
 	    this->mixer.source_id = esd_pi->source_id;
-	    
+
 	    if(!this->mixer.mute)
-	      this->mixer.volume  = (((esd_pi->left_vol_scale * 100)  / 256) + 
+	      this->mixer.volume  = (((esd_pi->left_vol_scale * 100)  / 256) +
 				     ((esd_pi->right_vol_scale * 100) / 256)) >> 1;
 
 	  }
@@ -372,7 +372,7 @@
       }
       esd_close(mixer_fd);
     }
-    
+
     return this->mixer.volume;
     break;
 
@@ -390,39 +390,39 @@
 
   switch(property) {
   case AO_PROP_MIXER_VOL:
-      
+
     if(!this->mixer.mute) {
-      
+
       /* need this to get source_id */
       (void) ao_esd_get_property(&this->ao_driver, AO_PROP_MIXER_VOL);
 
       if((mixer_fd = esd_open_sound(NULL)) >= 0) {
 	int v = (value * 256) / 100;
-	
+
 	esd_set_stream_pan(mixer_fd, this->mixer.source_id, v, v);
-	
+
 	if(!this->mixer.mute)
 	  this->mixer.volume = value;
-	
+
 	esd_close(mixer_fd);
       }
     }
     else
       this->mixer.volume = value;
-    
+
     return this->mixer.volume;
     break;
-    
+
   case AO_PROP_MUTE_VOL: {
     int mute = (value) ? 1 : 0;
-    
+
     /* need this to get source_id */
     (void) ao_esd_get_property(&this->ao_driver, AO_PROP_MIXER_VOL);
-    
+
     if(mute) {
       if((mixer_fd = esd_open_sound(NULL)) >= 0) {
 	int v = 0;
-	
+
 	esd_set_stream_pan(mixer_fd, this->mixer.source_id, v, v);
 	esd_close(mixer_fd);
       }
@@ -430,14 +430,14 @@
     else {
       if((mixer_fd = esd_open_sound(NULL)) >= 0) {
 	int v = (this->mixer.volume * 256) / 100;
-	
+
 	esd_set_stream_pan(mixer_fd, this->mixer.source_id, v, v);
 	esd_close(mixer_fd);
       }
     }
-    
+
     this->mixer.mute = mute;
-    
+
     return value;
   }
   break;
@@ -465,7 +465,7 @@
   return 0;
 }
 
-static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, 
+static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 				 const void *data) {
 
   esd_class_t       *class = (esd_class_t *) class_gen;
@@ -491,7 +491,7 @@
 
   sigemptyset(&vo_mask);
   sigaddset(&vo_mask, SIGALRM);
-  if (sigprocmask(SIG_UNBLOCK, &vo_mask, &vo_mask_orig)) 
+  if (sigprocmask(SIG_UNBLOCK, &vo_mask, &vo_mask_orig))
     xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_esd_out: cannot unblock SIGALRM: %s\n", strerror(errno));
 
   xprintf(class->xine, XINE_VERBOSITY_LOG, _("audio_esd_out: connecting to esd server...\n"));
@@ -511,7 +511,7 @@
 
     return NULL;
   }
-  
+
   esd_svinfo = esd_get_server_info(audio_fd);
   if (esd_svinfo) {
       server_sample_rate = esd_svinfo->rate;
@@ -590,7 +590,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_ESD_IFACE_VERSION, "esd", XINE_VERSION_CODE, &ao_info_esd, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -46,7 +46,7 @@
 	unsigned char bRiffMagic[4];	// 'RIFF'
 	uint32_t wRiffLength ;		// length of file minus the 8 byte riff header
 	unsigned char bWaveMagic[8];	// 'WAVEfmt '
-	uint32_t wFmtSize;		// length of format chunk minus 8 byte header 
+	uint32_t wFmtSize;		// length of format chunk minus 8 byte header
 	uint16_t wFormatTag;		// identifies PCM, ULAW etc
 	uint16_t wChannels;
 	uint32_t dwSamplesPerSecond;	// samples per second per channel
@@ -93,7 +93,7 @@
 	file_driver_t *this = (file_driver_t *) this_gen;
 	struct wavhdr w;
 
-	xprintf (this->xine, XINE_VERBOSITY_LOG, 
+	xprintf (this->xine, XINE_VERBOSITY_LOG,
 		 "audio_file_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode);
 
 	this->mode                   = mode;
@@ -314,7 +314,7 @@
 	return 0;
 }
 
-static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, 
+static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 				 const void *data) {
 
 	file_class_t     *class = (file_class_t *) class_gen;
@@ -383,7 +383,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-	/* type, API, "name", version, special_info, init_function */  
+	/* type, API, "name", version, special_info, init_function */
 	{ PLUGIN_AUDIO_OUT, AO_OUT_FILE_IFACE_VERSION, "file", XINE_VERSION_CODE, &ao_info_file, init_class },
 	{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c
--- a/src/audio_out/audio_fusionsound_out.c
+++ b/src/audio_out/audio_fusionsound_out.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2006 the xine project and Claudio Ciccani
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -47,7 +47,7 @@
 #define FUSIONSOUND_VERSION_CODE  VERSION_CODE( FUSIONSOUND_MAJOR_VERSION, \
                                                 FUSIONSOUND_MINOR_VERSION, \
                                                 FUSIONSOUND_MICRO_VERSION )
-                                                
+
 #if FUSIONSOUND_VERSION_CODE >= VERSION_CODE(1,1,0)
 # include <fusionsound_limits.h> /* defines FS_MAX_CHANNELS */
 #else
@@ -75,10 +75,10 @@
 
   float                 vol;
   int                   vol_mute;
-  
+
   float                 amp;
   int                   amp_mute;
-  
+
   int                   paused;
 } fusionsound_driver_t;
 
@@ -96,12 +96,12 @@
   DFBResult             ret;
 
   lprintf ("ao_open( bits=%d, rate=%d, mode=%d )\n", bits, rate, mode);
-  
-  dsc.flags = FSSDF_BUFFERSIZE   | FSBDF_CHANNELS | 
+
+  dsc.flags = FSSDF_BUFFERSIZE   | FSBDF_CHANNELS |
               FSSDF_SAMPLEFORMAT | FSSDF_SAMPLERATE;
 
   switch (mode) {
-    case AO_CAP_MODE_MONO: 
+    case AO_CAP_MODE_MONO:
       dsc.channels = 1;
       break;
     case AO_CAP_MODE_STEREO:
@@ -168,13 +168,13 @@
       this->playback->Release (this->playback);
       this->playback = NULL;
     }
-    
+
     if (this->stream) {
       this->stream->Release (this->stream);
       this->stream = NULL;
     }
-    
-    ret = this->sound->CreateStream (this->sound, &dsc, &this->stream);  
+
+    ret = this->sound->CreateStream (this->sound, &dsc, &this->stream);
     if (ret != DFB_OK) {
       xprintf (this->xine, XINE_VERBOSITY_LOG,
                "audio_fusionsound_out: IFusionSound::CreateStream() failed [%s]\n",
@@ -188,10 +188,10 @@
     this->channels = dsc.channels;
     this->rate = dsc.samplerate;
     this->bytes_per_frame = this->channels * FS_BYTES_PER_SAMPLE(this->format);
-    
+
     ret = this->stream->GetPlayback (this->stream, &this->playback);
     if (ret == DFB_OK) {
-      this->playback->SetVolume (this->playback, 
+      this->playback->SetVolume (this->playback,
                                  (this->vol_mute ? 0 : this->vol) *
                                  (this->amp_mute ? 0 : this->amp));
       if (this->paused)
@@ -210,22 +210,22 @@
 
 static int ao_fusionsound_num_channels(ao_driver_t *ao_driver) {
   fusionsound_driver_t *this = (fusionsound_driver_t *) ao_driver;
-  
+
   return this->channels;
 }
 
 static int ao_fusionsound_bytes_per_frame(ao_driver_t *ao_driver) {
   fusionsound_driver_t *this = (fusionsound_driver_t *) ao_driver;
-  
+
   return this->bytes_per_frame;
 }
 
 static int ao_fusionsound_delay(ao_driver_t *ao_driver) {
   fusionsound_driver_t *this  = (fusionsound_driver_t *) ao_driver;
   int                   delay = 0;
-  
+
   this->stream->GetPresentationDelay (this->stream, &delay);
-  
+
   return (delay * this->rate / 1000);
 }
 
@@ -237,7 +237,7 @@
                                 int16_t *data, uint32_t num_frames) {
   fusionsound_driver_t *this = (fusionsound_driver_t *) ao_driver;
   DFBResult             ret;
-  
+
   if (this->paused) {
     xprintf (this->xine, XINE_VERBOSITY_DEBUG,
              "audio_fusionsound_out: "
@@ -254,7 +254,7 @@
              FusionSoundErrorString (ret));
     return 0;
   }
[... 34 lines omitted ...]
     this->sound->Release (this->sound);
-    
+
   free (this);
 }
 
@@ -320,17 +320,17 @@
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
                "audio_fusionsound_out: volume mute is %d\n", this->vol_mute);
       return this->vol_mute;
-      
+
     case AO_PROP_AMP:
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
                "audio_fusionsound_out: amplifier is %.2f\n", this->amp);
       return (int) (this->amp * 100.0);
-      
+
     case AO_PROP_AMP_MUTE:
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
                "audio_fusionsound_out: amplifier mute is %d\n", this->amp_mute);
       return this->amp_mute;
-      
+
     default:
       break;
   }
@@ -338,10 +338,10 @@
   return 0;
 }
 
-static int ao_fusionsound_set_property(ao_driver_t *ao_driver, 
+static int ao_fusionsound_set_property(ao_driver_t *ao_driver,
                                        int property, int value ) {
   fusionsound_driver_t *this = (fusionsound_driver_t *) ao_driver;
-  
+
   if (!this->playback)
     return 0;
 
@@ -351,11 +351,11 @@
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
               "audio_fusionsound_out: volume set to %.2f\n", this->vol);
       break;
-      
+
     case AO_PROP_MUTE_VOL:
       this->vol_mute = value ? 1 : 0;
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
-               "audio_fusionsound_out: volume mute set to %d\n", 
+               "audio_fusionsound_out: volume mute set to %d\n",
                this->vol_mute);
       break;
 
@@ -364,20 +364,20 @@
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
               "audio_fusionsound_out: amplifier set to %.2f\n", this->amp);
       break;
-      
+
     case AO_PROP_AMP_MUTE:
       this->amp_mute = value ? 1 : 0;
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
-               "audio_fusionsound_out: amplifier mute set to %d\n", 
+               "audio_fusionsound_out: amplifier mute set to %d\n",
                this->amp_mute);
       break;
 
     default:
       return 0;
   }
-  
+
   if (this->playback) {
-    this->playback->SetVolume (this->playback, 
+    this->playback->SetVolume (this->playback,
                               (this->vol_mute ? 0 : this->vol) *
                               (this->amp_mute ? 0 : this->amp));
   }
@@ -395,10 +395,10 @@
         this->playback->Stop (this->playback);
       this->paused = 1;
       return 1;
-    
+
     case AO_CTRL_PLAY_RESUME:
       lprintf ("Resume()\n");
-      if (this->playback)        
+      if (this->playback)
         this->playback->Continue (this->playback);
       this->paused = 0;
       return 1;
@@ -417,7 +417,7 @@
 }
 
 
-static ao_driver_t* open_plugin(audio_driver_class_t *ao_class, 
+static ao_driver_t* open_plugin(audio_driver_class_t *ao_class,
                                 const void           *data ) {
   fusionsound_class_t  *class  = (fusionsound_class_t *) ao_class;
   fusionsound_driver_t *this;
@@ -457,7 +457,7 @@
   this->ao_driver.exit              = ao_fusionsound_exit;
   this->ao_driver.get_gap_tolerance = ao_fusionsound_get_gap_tolerance;
   this->ao_driver.control            = ao_fusionsound_control;
-  
+
   this->vol = this->amp = 1.0;
 
   return &this->ao_driver;
@@ -470,7 +470,7 @@
 static void* init_class(xine_t *xine, void *data) {
   fusionsound_class_t *class;
   const char          *error;
-  
+
   /* check FusionSound version */
   error = FusionSoundCheckVersion( FUSIONSOUND_MAJOR_VERSION,
                                    FUSIONSOUND_MINOR_VERSION,
@@ -506,7 +506,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_FS_IFACE_VERSION, "FusionSound",
     XINE_VERSION_CODE, &ao_info_fusionsound, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }

diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -113,7 +113,7 @@
   default:
     xlerror ("irixal Driver does not support the requested mode: 0x%x",mode);
     return 0;
-  } 
+  }
 
   if (! (config = alNewConfig ()))
   {
@@ -126,7 +126,7 @@
     alFreeConfig (config);
     return 0;
   }
-    
+
   switch (bits) {
     case 8:
       if ( (alSetWidth (config, AL_SAMPLE_8)) == -1)
@@ -211,7 +211,7 @@
   return this->gap_tolerance;
 }
 
-static int ao_irixal_delay (ao_driver_t *this_gen) 
+static int ao_irixal_delay (ao_driver_t *this_gen)
 {
   irixal_driver_t *this = (irixal_driver_t *) this_gen;
   stamp_t stamp, time;
@@ -230,7 +230,7 @@
 {
   irixal_driver_t *this = (irixal_driver_t *) this_gen;
   stamp_t stamp;
-  	
+
   /* Grmbf. IRIX audio does not tell us, wenn we run dry.
    * We have to detect this ourself. */
   /* get absolute number of samples played so far
@@ -249,7 +249,7 @@
    * alGetFillable() would tell us, whether space was available */
   alWriteFrames (this->port, data, num_frames);
   this->frames_in_buffer += num_frames;
-  
+
   return num_frames;
 }
 
@@ -376,9 +376,9 @@
       }
     }
   }
-  
+
   printf ("  capabilities 0x%X\n",this->capabilities);
- 
+
   /* TODO: anything can change during runtime... move check to the right location */
   this->gap_tolerance = config->register_range (config, "audio.device.irixal_gap_tolerance",
 					        DEFAULT_GAP_TOLERANCE, 0, 90000,
@@ -396,7 +396,7 @@
   this->ao_driver.num_channels        = ao_irixal_num_channels;
   this->ao_driver.bytes_per_frame     = ao_irixal_bytes_per_frame;
   this->ao_driver.delay               = ao_irixal_delay;
-  this->ao_driver.write	 	      = ao_irixal_write;
+  this->ao_driver.write		      = ao_irixal_write;
   this->ao_driver.close               = ao_irixal_close;
   this->ao_driver.exit                = ao_irixal_exit;
   this->ao_driver.get_gap_tolerance   = ao_irixal_get_gap_tolerance;
@@ -421,7 +421,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_IRIXAL_IFACE_VERSION, "irixal", XINE_VERSION_CODE, &ao_info_irixal, init_audio_out_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -89,7 +89,7 @@
 /**
  * \brief get the number of free bytes in the buffer
  * \return number of free bytes in buffer
- * 
+ *
  * may only be called by Xine's thread
  * return value may change between immediately following two calls,
  * and the real number of free bytes might be larger!
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c
--- a/src/audio_out/audio_none_out.c
+++ b/src/audio_out/audio_none_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -40,7 +40,7 @@
 #define AUDIO_NUM_FRAGMENTS     15
 #define AUDIO_FRAGMENT_SIZE   8192
 
-#define GAP_TOLERANCE        AO_MAX_GAP 
+#define GAP_TOLERANCE        AO_MAX_GAP
 
 typedef struct none_driver_s {
 
@@ -74,7 +74,7 @@
 {
   none_driver_t *this = (none_driver_t *) this_gen;
 
-  xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 	   "audio_none_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode);
 
   this->mode                   = mode;
@@ -115,13 +115,13 @@
                          uint32_t num_frames)
 {
   none_driver_t *this = (none_driver_t *) this_gen;
-  
+
   /* take some time to pretend we are doing something.
    * avoids burning cpu.
    */
   if( (1000 * num_frames / this->sample_rate) > 10 )
     xine_usec_sleep ((1000 * num_frames / this->sample_rate)*1000/2);
-    
+
   return 1;
 }
 
@@ -143,7 +143,7 @@
 static void ao_none_exit(ao_driver_t *this_gen)
 {
   none_driver_t *this = (none_driver_t *) this_gen;
-  
+
   ao_none_close(this_gen);
 
   free (this);
@@ -177,7 +177,7 @@
   return 0;
 }
 
-static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, 
+static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 				 const void *data) {
 
   none_class_t     *class = (none_class_t *) class_gen;
@@ -244,7 +244,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_NONE_IFACE_VERSION, "none", XINE_VERSION_CODE, &ao_info_none, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@...
- * 
+ *
  * General Programming Guidelines: -
  * New concept of an "audio_frame".
  * An audio_frame consists of all the samples required to fill every audio channel
@@ -90,7 +90,7 @@
 #endif
 
 #ifndef AFMT_AC3
-#       define AFMT_AC3         0x00000400  
+#       define AFMT_AC3         0x00000400
 #endif
 
 #define AO_OUT_OSS_IFACE_VERSION 9
@@ -127,7 +127,7 @@
   uint32_t	   bytes_per_frame;
   uint32_t         bytes_in_buffer;      /* number of bytes writen to audio hardware   */
   uint32_t         last_getoptr;
-    
+
   int              audio_started;
   int              sync_method;
   int              latency;
@@ -178,7 +178,7 @@
 
     close (this->audio_fd);
   }
-  
+
   this->mode                   = mode;
   this->input_sample_rate      = rate;
   this->bits_per_sample        = bits;
@@ -192,11 +192,11 @@
 
   this->audio_fd=open(this->audio_dev,O_WRONLY|O_NONBLOCK);
   if (this->audio_fd < 0) {
-    xprintf(this->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("audio_oss_out: Opening audio device %s: %s\n"), this->audio_dev, strerror(errno));
     return 0;
   }
-  
+
   /* We wanted non blocking open but now put it back to normal */
   fcntl(this->audio_fd, F_SETFL, fcntl(this->audio_fd, F_GETFL)&~O_NONBLOCK);
 
@@ -213,8 +213,8 @@
 
     tmp = this->input_sample_rate;
     if (ioctl(this->audio_fd,SNDCTL_DSP_SPEED, &tmp) == -1) {
-      
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"),
 	      this->input_sample_rate);
 
@@ -272,7 +272,7 @@
 
   xprintf(this->xine, XINE_VERBOSITY_LOG, "audio_oss_out: %d channels output\n", this->num_channels);
   this->bytes_per_frame=(this->bits_per_sample*this->num_channels)/8;
-  
+
   /*
    * set format
    */
@@ -303,7 +303,7 @@
         else
           xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
         return 0;
-      }          
+      }
     }
     break;
   case AO_CAP_MODE_A52:
@@ -317,7 +317,7 @@
     ioctl(this->audio_fd, SNDCTL_DSP_CHANNELS, &tmp);
     tmp = AFMT_AC3;
     if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
-      xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	      "audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d. Using alternative.\n",tmp);
       tmp = AFMT_S16_LE;
       ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp);
@@ -344,7 +344,7 @@
 
      printf ("audio_oss_out: audio buffer fragment info : %x\n",tmp);
 
-     ioctl(this->audio_fd,SNDCTL_DSP_SETFRAGMENT,&tmp); 
+     ioctl(this->audio_fd,SNDCTL_DSP_SETFRAGMENT,&tmp);
   */
 
   return this->output_sample_rate;
@@ -395,9 +395,9 @@
                   * this->output_sample_k_rate / 1000;
     frames += (tv.tv_sec - this->start_time.tv_sec)
                   * this->output_sample_rate;
-    
[... 278 lines omitted ...]
   if ( (status != -1) && (num_channels==2) ) {
     this->capabilities |= AO_CAP_MODE_STEREO;
     xine_strcat_realloc (&logmsg, _(" stereo"));
   }
-  num_channels = 4; 
-  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
+  num_channels = 4;
+  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels);
   if ( (status != -1) && (num_channels==4) )  {
     if  ( speakers == SURROUND4 ) {
       this->capabilities |= AO_CAP_MODE_4CHANNEL;
       xine_strcat_realloc (&logmsg, _(" 4-channel"));
-    } 
+    }
     else
       xine_strcat_realloc (&logmsg, _(" (4-channel not enabled in xine config)"));
   }
-  num_channels = 5; 
-  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
+  num_channels = 5;
+  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels);
   if ( (status != -1) && (num_channels==5) ) {
     if  ( speakers == SURROUND5 ) {
       this->capabilities |= AO_CAP_MODE_5CHANNEL;
@@ -988,13 +988,13 @@
     else
       xine_strcat_realloc (&logmsg, _(" (5-channel not enabled in xine config)"));
   }
-  num_channels = 6; 
-  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
+  num_channels = 6;
+  status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels);
   if ( (status != -1) && (num_channels==6) ) {
     if  ( speakers == SURROUND51 ) {
       this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
       xine_strcat_realloc (&logmsg, _(" 5.1-channel"));
-    } 
+    }
     else
       xine_strcat_realloc (&logmsg, _(" (5.1-channel not enabled in xine config)"));
   }
@@ -1007,13 +1007,13 @@
     this->capabilities |= AO_CAP_MODE_A52;
     this->capabilities |= AO_CAP_MODE_AC5;
     xine_strcat_realloc (&logmsg, _(" a/52 pass-through"));
-  } 
-  else 
+  }
+  else
     xine_strcat_realloc (&logmsg, _(" (a/52 pass-through not enabled in xine config)"));
 
   xprintf(class->xine, XINE_VERBOSITY_DEBUG, "%s\n", logmsg);
   free (logmsg);
-  
+
   /*
    * mixer initialisation.
    */
@@ -1022,7 +1022,7 @@
     int mixer_num;
     int audio_devs;
     char *parse;
-    
+
     mixer_num = config->register_num(config, "audio.device.oss_mixer_number", -1,
 				     _("OSS audio mixer number, -1 for none"),
 				     _("The full mixer device name is created by taking the "
@@ -1033,7 +1033,7 @@
 				       "The range of this value is -1 or 0-15. This setting is "
 				       "ignored, when the OSS audio device name is set to \"auto\"."),
 				     10, NULL, NULL);
-    
+
     /* get the mixer device name from the audio device name by replacing "dsp" with "mixer" */
     strcpy(mixer_name, this->audio_dev);
     if ((parse = strstr(mixer_name, "dsp"))) {
@@ -1047,13 +1047,13 @@
 	asprintf(&this->mixer.name, "%smixer%d", mixer_name, mixer_num);
     }
     _x_assert(this->mixer.name);
-    
+
     this->mixer.fd = open(this->mixer.name, O_RDONLY);
 
     if(this->mixer.fd != -1) {
 
       ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-      
+
       if(audio_devs & SOUND_MASK_PCM) {
 	this->capabilities |= AO_CAP_PCM_VOL;
 	this->mixer.prop = AO_PROP_PCM_VOL;
@@ -1062,9 +1062,9 @@
 	this->capabilities |= AO_CAP_MIXER_VOL;
 	this->mixer.prop = AO_PROP_MIXER_VOL;
       }
-      
+
       /*
-       * This is obsolete in Linux kernel OSS 
+       * This is obsolete in Linux kernel OSS
        * implementation, so this will certainly doesn't work.
        * So we just simulate the mute stuff
        */
@@ -1073,11 +1073,11 @@
 	this->capabilities |= AO_CAP_MUTE_VOL;
       */
       this->capabilities |= AO_CAP_MUTE_VOL;
-      
-    } else 
+
+    } else
       xprintf (class->xine, XINE_VERBOSITY_LOG,
 	       _("audio_oss_out: open() mixer %s failed: %s\n"), this->mixer.name, strerror(errno));
-    
+
     this->mixer.mute = 0;
     this->mixer.volume = ao_oss_get_property (&this->ao_driver, this->mixer.prop);
 
@@ -1171,7 +1171,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_OUT_OSS_IFACE_VERSION, "oss", XINE_VERSION_CODE, &ao_info_oss, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2001-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -159,7 +159,7 @@
   silence = calloc(1, len);
   if (silence == NULL)
     goto error;
-    
+
   if ((fd = open(dev, O_WRONLY|O_NONBLOCK)) < 0)
     goto error;
 
@@ -176,7 +176,7 @@
     xprintf(xine, XINE_VERBOSITY_DEBUG, "rtsc: SETINFO failed\n");
     goto error;
   }
-    
+
   if (write(fd, silence, len) != len) {
     xprintf(xine, XINE_VERBOSITY_DEBUG, "rtsc: write failed\n");
     goto error;
@@ -195,7 +195,7 @@
     delay.tv_sec = 0;
     delay.tv_nsec = 10000000;
     nanosleep(&delay, NULL);
- 
+
     gettimeofday(&end, NULL);
     usec_delay = (end.tv_sec - start.tv_sec) * 1000000
 	+ end.tv_usec - start.tv_usec;
@@ -230,7 +230,7 @@
    * sample counter increment from the soundcard driver of less than
    * 2000 samples,  we assume that the driver provides a useable realtime
    * sample counter in the AUDIO_INFO play.samples field.  Timing based
-   * on sample counts should be much more accurate than counting whole 
+   * on sample counts should be much more accurate than counting whole
    * 16kbyte chunks.
    */
   if (min_increment < 2000)
@@ -238,10 +238,10 @@
 
   /*
   printf("audio_sun_out: minimum sample counter increment per 10msec interval: %d\n"
-  	 "\t%susing sample counter based timing code\n",
+	 "\t%susing sample counter based timing code\n",
 	 min_increment, rtsc_ok == RTSC_ENABLED ? "" : "not ");
   */
-    
+
 
 error:
   if (silence != NULL) free(silence);
@@ -261,7 +261,7 @@
 }
 
 
-/* 
+/*
  * match the requested sample rate |sample_rate| against the
  * sample rates supported by the audio device |dev|.  Return
  * a supported sample rate,  it that sample rate is close to
@@ -292,7 +292,7 @@
 
     if (sr->flags & MIXER_SR_LIMITS) {
 	/*
-	 * HW can playback any rate between 
+	 * HW can playback any rate between
 	 * sr->samp_rates[0] .. sr->samp_rates[1]
 	 */
 	free(sr);
@@ -338,7 +338,7 @@
     for (i = 0; audiocs_rates[i]; i++) {
 	err = abs(audiocs_rates[i] - sample_rate);
 	if (err == 0) {
-	    /* 
+	    /*
 	     * exact supported sample rate match, no need to
 	     * retry something elise
 	     */
@@ -383,7 +383,7 @@
 
     if (sr->flags & MIXER_SR_LIMITS) {
 	/*
-	 * HW can playback any rate between 
+	 * HW can playback any rate between
 	 * sr->samp_rates[0] .. sr->samp_rates[1]
 	 */
 	max_rate = sr->samp_rates[1];
@@ -410,7 +410,7 @@
  * Implicit assumptions about audio format (bits/rate/mode):
  *
  * bits == 16: We always get 16-bit samples in native endian format,
- * 	using signed linear encoding
+ *	using signed linear encoding
  *
  * bits ==  8: 8-bit samples use unsigned linear encoding,
  *	other 8-bit formats (uLaw, aLaw, etc) are currently not supported
@@ -438,7 +438,7 @@
 
     close (this->audio_fd);
   }
-  
+
   this->mode			= mode;
[... 5 lines omitted ...]
   if(this->audio_fd < 0) {
-    xprintf(this->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("audio_sun_out: opening audio device %s failed: %s\n"), this->audio_dev, strerror(errno));
     return 0;
   }
-  
+
   /* We wanted non blocking open but now put it back to normal */
   fcntl(this->audio_fd, F_SETFL, fcntl(this->audio_fd, F_GETFL) & ~O_NONBLOCK);
 
@@ -483,7 +483,7 @@
 
       if (pass & 1) {
 	  /*
-	   * on some sun audio drivers, 8-bit unsigned LINEAR8 encoding is 
+	   * on some sun audio drivers, 8-bit unsigned LINEAR8 encoding is
 	   * not supported, but 8-bit signed encoding is.
 	   *
 	   * Try S8, and if it works, use our own U8->S8 conversion before
@@ -509,7 +509,7 @@
 	   */
 	  if (!(info.play.sample_rate =
 		find_close_samplerate_match(this->audio_fd,
-					    this->input_sample_rate))) 
+					    this->input_sample_rate)))
 	      continue;
       }
 
@@ -565,7 +565,7 @@
   return this->output_sample_rate;
 }
 
-static int ao_sun_num_channels(ao_driver_t *this_gen) 
+static int ao_sun_num_channels(ao_driver_t *this_gen)
 {
   sun_driver_t *this = (sun_driver_t *) this_gen;
   return this->num_channels;
@@ -587,7 +587,7 @@
       (this->frames_in_buffer == 0 || info.play.samples > 0)) {
 
     if (info.play.samples < this->last_samplecnt) {
-	xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 		"audio_sun_out: broken sound driver, sample counter runs backwards, cur %u < prev %u\n",
 		info.play.samples, this->last_samplecnt);
     }
@@ -726,7 +726,7 @@
   int num_written;
 
   if (this->convert_u8_s8) {
-      /* 
+      /*
        * Audio hardware does not support 8-bit unsigned format,
        * only 8-bit signed.  Convert to 8-bit unsigned before sending
        * the data to the audio device.
@@ -734,7 +734,7 @@
       uint8_t *p = (void *)frame_buffer;
       int i;
 
-      for (i = num_frames * this->bytes_per_frame; --i >= 0; p++) 
+      for (i = num_frames * this->bytes_per_frame; --i >= 0; p++)
 	  *p ^= 0x80;
   }
   num_written = sun_audio_write(this, frame_buffer, num_frames * this->bytes_per_frame);
@@ -745,7 +745,7 @@
     this->frames_in_buffer += num_written / this->bytes_per_frame;
 #endif
 
-    /* 
+    /*
      * Avoid storing too much data in the sound driver's buffers.
      *
      * When we find more than 3 seconds of buffered audio data in the
@@ -781,7 +781,7 @@
 static void ao_sun_exit(ao_driver_t *this_gen)
 {
   sun_driver_t *this = (sun_driver_t *) this_gen;
-  
+
   if (this->audio_fd >= 0)
     close(this->audio_fd);
 
@@ -867,7 +867,7 @@
     /* flush buffered STEAMS data first */
     ioctl(this->audio_fd, I_FLUSH, FLUSHW);
 
-    /* 
+    /*
      * the flush above discarded an unknown amount of data from the
      * audio device.  To get the "*_delay" computation in sync again,
      * reset the audio device's sample counter to 0, after waiting
@@ -942,7 +942,7 @@
 
   this->audio_fd = open(this->audio_dev = devname, O_WRONLY|O_NONBLOCK);
 
-  if(this->audio_fd < 0) 
+  if(this->audio_fd < 0)
   {
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("audio_sun_out: opening audio device %s failed: %s\n"), devname, strerror(errno));
@@ -960,7 +960,7 @@
   info.play.precision = AUDIO_PRECISION_16;
   info.play.sample_rate = 44100;
   status = ioctl(this->audio_fd, AUDIO_SETINFO, &info);
-  
+
   if (status < 0) {
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("audio_sun_out: audio ioctl on device %s failed: %s\n"), devname, strerror(errno));
@@ -974,7 +974,7 @@
    */
 
   this->capabilities = AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO | AO_CAP_8BITS
-  		     | AO_CAP_16BITS | AO_CAP_PCM_VOL;
+		     | AO_CAP_16BITS | AO_CAP_PCM_VOL;
 #ifdef __svr4__
   this->capabilities |= AO_CAP_MUTE_VOL;
 #endif
@@ -1038,7 +1038,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_AUDIO_OUT, AO_SUN_IFACE_VERSION, "sun", XINE_VERSION_CODE, &ao_info_sun, ao_sun_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -42,7 +42,7 @@
 
 xineplug_xiph_la_SOURCES = xine_ogg_demuxer.c
 xineplug_xiph_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
-xineplug_xiph_la_CFLAGS = $(AM_CFLAGS) 
+xineplug_xiph_la_CFLAGS = $(AM_CFLAGS)
 xineplug_xiph_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
 
 if ENABLE_VORBIS
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2001-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine audio decoder plugin using ffmpeg
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -65,7 +65,7 @@
 
   AVCodecContext    *context;
   AVCodec           *codec;
-  
+
   char              *decode_buffer;
   int               decoder_ok;
 
@@ -78,7 +78,7 @@
   if (size > this->bufsize) {
     this->bufsize = size + size / 2;
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-            _("ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"), 
+            _("ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"),
             this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
@@ -101,15 +101,15 @@
     ff_audio_ensure_buffer_size(this, this->size + buf->size);
     memcpy(this->buf + this->size, buf->content, buf->size);
     this->size += buf->size;
-    
+
     if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
       size_t i;
       unsigned int codec_type;
       xine_waveformatex *audio_header;
-  
+
       codec_type = buf->type & 0xFFFF0000;
       this->codec = NULL;
-  
+
       for(i = 0; i < sizeof(ff_audio_lookup)/sizeof(ff_codec_t); i++)
         if(ff_audio_lookup[i].type == codec_type) {
 	  pthread_mutex_lock (&ffmpeg_lock);
@@ -119,57 +119,57 @@
                            ff_audio_lookup[i].name);
           break;
         }
-  
+
       if (!this->codec) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
+        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
                  _("ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
                  codec_type);
         _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
         return;
       }
-  
+
       this->context = avcodec_alloc_context();
-      
+
       if(buf->decoder_flags & BUF_FLAG_STDHEADER) {
         this->audio_sample_rate = buf->decoder_info[1];
         this->audio_channels    = buf->decoder_info[3];
-      
+
         if(this->size) {
           audio_header = (xine_waveformatex *)this->buf;
-        
+
           this->context->block_align = audio_header->nBlockAlign;
           this->context->bit_rate    = audio_header->nAvgBytesPerSec * 8;
-      
+
           if(audio_header->cbSize > 0) {
             this->context->extradata = malloc(audio_header->cbSize);
             this->context->extradata_size = audio_header->cbSize;
-            memcpy( this->context->extradata, 
+            memcpy( this->context->extradata,
                     (uint8_t *)audio_header + sizeof(xine_waveformatex),
-                    audio_header->cbSize ); 
+                    audio_header->cbSize );
           }
         }
       } else {
         short *ptr;
-        
+
         switch(codec_type) {
           case BUF_AUDIO_14_4:
             this->audio_sample_rate = 8000;
             this->audio_channels    = 1;
-          
+
             this->context->block_align = 240;
             break;
           case BUF_AUDIO_28_8:
             this->audio_sample_rate = _X_BE_16(&this->buf[0x30]);
             this->audio_channels    = this->buf[0x37];
             /* this->audio_bits = buf->content[0x35] */
-  
+
             this->context->block_align = _X_BE_32(&this->buf[0x18]);
 
             this->context->extradata_size = 5*sizeof(short);
             this->context->extradata      = malloc(this->context->extradata_size);
-  
+
             ptr = (short *) this->context->extradata;
-  
+
             ptr[0] = _X_BE_16(&this->buf[0x2C]); /* subpacket size */
             ptr[1] = _X_BE_16(&this->buf[0x28]); /* subpacket height */
             ptr[2] = _X_BE_16(&this->buf[0x16]); /* subpacket flavour */
@@ -226,23 +226,23 @@
             break;
         }
       }
-  
-      /* Current ffmpeg audio decoders always use 16 bits/sample 
+
+      /* Current ffmpeg audio decoders always use 16 bits/sample
        * buf->decoder_info[2] can't be used as it doesn't refer to the output
        * bits/sample for some codecs (e.g. MS ADPCM) */
-      this->audio_bits = 16;  
-  
+      this->audio_bits = 16;
+
       this->context->bits_per_sample = this->audio_bits;
       this->context->sample_rate = this->audio_sample_rate;
       this->context->channels    = this->audio_channels;
       this->context->codec_id    = this->codec->id;
       this->context->codec_type  = this->codec->type;
       this->context->codec_tag   = _x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC);
-  
+
       this->size = 0;
-  
+
       this->decode_buffer = calloc(1, AVCODEC_MAX_AUDIO_FRAME_SIZE);
-  
+
       return;
     }
   } else if ((buf->decoder_flags & BUF_FLAG_SPECIAL) &&
@@ -267,12 +267,12 @@
       pthread_mutex_lock (&ffmpeg_lock);
       if (avcodec_open (this->context, this->codec) < 0) {
 	pthread_mutex_unlock (&ffmpeg_lock);
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
+        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
                  _("ffmpeg_audio_dec: couldn't open decoder\n"));
         _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
         return;
       }
-      pthread_mutex_unlock (&ffmpeg_lock);  
+      pthread_mutex_unlock (&ffmpeg_lock);
       this->decoder_ok = 1;
     }
 
@@ -310,14 +310,14 @@
       offset = 0;
       while (this->size>0) {
         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-        bytes_consumed = avcodec_decode_audio2 (this->context, 
+        bytes_consumed = avcodec_decode_audio2 (this->context,
                                                (int16_t *)this->decode_buffer,
-                                               &decode_buffer_size, 
+                                               &decode_buffer_size,
                                                &this->buf[offset],
                                                this->size);
 
         if (bytes_consumed<0) {
-          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
                    "ffmpeg_audio_dec: error decompressing audio frame\n");
           this->size=0;
           return;
@@ -337,10 +337,10 @@
             return;
 	  }
 
-          audio_buffer = 
+          audio_buffer =
             this->stream->audio_out->get_buffer (this->stream->audio_out);
           if (audio_buffer->mem_size == 0) {
-            xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+            xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
                      "ffmpeg_audio_dec: Help! Allocated audio buffer with nothing in it!\n");
             return;
           }
@@ -376,7 +376,7 @@
 
 static void ff_audio_reset (audio_decoder_t *this_gen) {
   ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  
+
   this->size = 0;
 
   /* try to reset the wma decoder */
@@ -395,7 +395,7 @@
 static void ff_audio_dispose (audio_decoder_t *this_gen) {
 
   ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  
+
   if( this->context && this->decoder_ok ) {
     pthread_mutex_lock (&ffmpeg_lock);
     avcodec_close (this->context);
@@ -436,7 +436,7 @@
   this->size = 0;
   this->bufsize = 0;
   this->decoder_ok = 0;
-  
+
   ff_audio_ensure_buffer_size(this, AUDIOBUFSIZE);
 
   return &this->audio_decoder;
diff --git a/src/combined/ffmpeg/ff_mpeg_parser.c b/src/combined/ffmpeg/ff_mpeg_parser.c
--- a/src/combined/ffmpeg/ff_mpeg_parser.c
+++ b/src/combined/ffmpeg/ff_mpeg_parser.c
@@ -57,7 +57,7 @@
 void mpeg_parser_dispose (mpeg_parser_t *parser)
 {
   if ( parser == NULL ) return;
-  
+
   free(parser->chunk_buffer);
 }
 
@@ -124,7 +124,7 @@
 {
   int is_frame_done;
   int next_code = parser->code;
-  
+
   /* wait for sequence_header_code */
   if (parser->is_sequence_needed) {
     if (code != 0xb3) {
@@ -133,7 +133,7 @@
       return 0;
     }
   }
-  
+
   is_frame_done = parser->in_slice && ((!next_code)  || (next_code == 0xb7));
 
   if (is_frame_done)
@@ -141,7 +141,7 @@
 
   switch (code) {
   case 0x00:        /* picture_start_code */
-    
+
     parse_header_picture (parser, buffer);
 
     parser->in_slice = 1;
@@ -150,11 +150,11 @@
     case B_TYPE:
       lprintf ("B-Frame\n");
       break;
-      
+
     case P_TYPE:
       lprintf ("P-Frame\n");
       break;
-        
+
     case I_TYPE:
       lprintf ("I-Frame\n");
       break;
@@ -169,11 +169,11 @@
     {
       int value;
       uint16_t width, height;
-      
+
       if (parser->is_sequence_needed) {
         parser->is_sequence_needed = 0;
       }
-      
+
       if ((buffer[6] & 0x20) != 0x20) {
         lprintf("Invalid sequence: missing marker_bit\n");
         parser->has_sequence = 0;
@@ -185,7 +185,7 @@
                buffer[2];
       width  = ((value >> 12) + 15) & ~15;
       height = ((value & 0xfff) + 15) & ~15;
-      
+
       if ((width > 1920) || (height > 1152)) {
         lprintf("Invalid sequence: width=%d, height=%d\n", width, height);
         parser->has_sequence = 0;
@@ -196,7 +196,7 @@
       parser->height = height;
       parser->rate_code = buffer[3] & 15;
       parser->aspect_ratio_info = buffer[3] >> 4;
-      
+
       if (parser->rate_code < (sizeof(frame_rate_tab)/sizeof(*frame_rate_tab))) {
         parser->frame_duration = 90000;
         parser->frame_duration *= frame_rate_tab[parser->rate_code][1];
@@ -211,7 +211,7 @@
       parser->is_mpeg1 = 1;
     }
     break;
-    
+
   case 0xb5:     /* extension_start_code */
     switch (buffer[0] & 0xf0) {
     case 0x10:     /* sequence extension */
@@ -282,7 +282,7 @@
 
   ret = 0;
   *flush = 0;
-  
+
   while (current != end) {
     if (parser->chunk_ptr == parser->chunk_buffer) {
       /* write the beginning of the chunk */
@@ -294,9 +294,9 @@
       parser->chunk_start = parser->chunk_ptr;
       parser->has_sequence = 0;
     }
-    
+
     code = parser->code;
-    
+
     current = copy_chunk (parser, current, end);
     if (current == NULL)
       return NULL;
@@ -309,10 +309,10 @@
       }
       parser->buffer_size = parser->chunk_ptr - parser->chunk_buffer - 4;
       parser->chunk_ptr = parser->chunk_buffer;
-      
+
       if (parser->code == 0xb7) /* sequence end, maybe a still menu */
         *flush = 1;
-      
+
       return current;
     }
   }
diff --git a/src/combined/ffmpeg/ff_mpeg_parser.h b/src/combined/ffmpeg/ff_mpeg_parser.h
--- a/src/combined/ffmpeg/ff_mpeg_parser.h
+++ b/src/combined/ffmpeg/ff_mpeg_parser.h
@@ -49,7 +49,7 @@
   uint8_t         in_slice:1;
 
   uint8_t         rate_code:4;
- 
+
   int             aspect_ratio_info;
 
   /* public properties */

# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 5]

diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h
--- a/src/input/vcd/xine-extra.h
+++ b/src/input/vcd/xine-extra.h
@@ -1,23 +1,23 @@
-/* 
- 
+/*
+
   Copyright (C) 2002 Rocky Bernstein <rocky@...>
-  
+
   Program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- 
+
   These are routines that probably should be in xine, but for whatever
-  reason aren't - yet. 
+  reason aren't - yet.
 */
 
 #ifndef XINE_EXTRA_H
@@ -47,7 +47,7 @@
 
   In short this writes a message to buffer 'buf' and to stdout.
 */
-void 
+void
 xine_vlog_msg(xine_t *this, int buf, const char *format, va_list args) XINE_FORMAT_PRINTF(3, 0);
 
 /*! This routine is like xine_log, except it takes a va_list instead
@@ -61,7 +61,7 @@
 
 /*! Call this before calling any of the xine_log_msg or xine_log_err
   routines. It sets up the xine buffer that will be used in error
-  logging.  
+  logging.
 
   \return true if everything went okay; false is returned if
   logging was already initialized, in which case nothing is done.
@@ -71,24 +71,24 @@
 
 /*! This routine is like xine_log without any xine-specific paramenters.
   Before calling this routine you should have set up a xine log buffer via
-  xine_log_init(). 
+  xine_log_init().
 
   In short this writes a message to buffer 'buf' and to stdout.
 
-  \return true if everything went okay; false is there was 
-  an error, such as logging wasn't initialized. On error, nothing is 
+  \return true if everything went okay; false is there was
+  an error, such as logging wasn't initialized. On error, nothing is
   logged.
 */
 bool xine_log_msg(const char *format, ...) XINE_FORMAT_PRINTF(1, 2);
 
 /*! This routine is like xine_log without any xine-specific paramenters.
   Before calling this routine you should have set up a xine log buffer via
-  xine_log_init(). 
+  xine_log_init().
 
   In short this writes a message to buffer 'buf' and to stdout.
 
-  \return true if everything went okay; false is there was 
-  an error, such as logging wasn't initialized. On error, nothing is 
+  \return true if everything went okay; false is there was
+  an error, such as logging wasn't initialized. On error, nothing is
   logged.
 */
 bool xine_log_err(const char *format, ...) XINE_FORMAT_PRINTF(1, 2);
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,23 +1,23 @@
 /*
- 
+
   Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@...>
-  
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
 */
 
-/* 
+/*
   These are plugin routines called by the xine engine. See
   Chapter 4. Extending xine's input
   http://www.xine-project.org/hackersguide#INPUT
@@ -83,8 +83,8 @@
 #define BUF_DEMUX_BLOCK 0x05000000
 #endif
 
-/* 
-   Convert an autoplay enumeration into an vcdinfo itemtype enumeration. 
+/*
+   Convert an autoplay enumeration into an vcdinfo itemtype enumeration.
    See definitions in vcdplayer.h and vcdinfo.h to get the below correct.
 */
 static const vcdinfo_item_enum_t autoplay2itemtype[]={
@@ -94,7 +94,7 @@
   VCDINFO_ITEM_TYPE_LID      /* VCDPLAYER_AUTOPLAY_PBC */
 };
 
-typedef struct vcd_config_s 
+typedef struct vcd_config_s
 {
   char         *title_format;        /* Format string of GUI display title */
   char         *comment_format;      /* Format string of stream comment meta */
@@ -106,7 +106,7 @@
   input_class_t        input_class;
   xine_t              *xine;
   config_values_t     *config;     /* Pointer to XineRC config file. */
-  vcd_input_plugin_t  *ip;                       
+  vcd_input_plugin_t  *ip;
 
   vcd_config_t         v_config;  /* config stuff passed to child */
   xine_mrl_t           **mrls;    /* list of mrl entries for medium */
@@ -114,10 +114,10 @@
   char                *vcd_device;/* Device name to use when
 				     none specified in MRL    */
   /*--------------------------------------------------------------
-    Media resource locator (MRL) info. 
+    Media resource locator (MRL) info.
 
     For the below offsets, use play_item + mrl_xxx_offset to get index
-    into "mrls" array 
+    into "mrls" array
    ---------------------------------------------------------------*/
   int        mrl_track_offset;    /* perhaps -1 for tracks staring with 1*/
   int        mrl_entry_offset;    /* i_tracks for entries starting with 0 */
@@ -130,10 +130,10 @@
 vcd_input_class_t *vcd_class;
 
 struct vcd_input_plugin_tag {
-  input_plugin_t    input_plugin; /* input plugin interface as defined by 
-                                     by player. For xine it contains a 
+  input_plugin_t    input_plugin; /* input plugin interface as defined by
+                                     by player. For xine it contains a
                                      structure of functions that need
-                                     to be implemented. 
+                                     to be implemented.
                                   */
   xine_stream_t      *stream;
   xine_event_queue_t *event_queue;
@@ -155,7 +155,7 @@
                                          the mouse is not in any "button"
                                          region then this has value -1.
                                       */
-  bool                b_mouse_in;     /* True if mouse is inside a "button" 
+  bool                b_mouse_in;     /* True if mouse is inside a "button"
                                          region; false otherwise */
 
   vcdplayer_t         player ;
@@ -168,13 +168,13 @@
 static bool vcd_handle_events (void);
 static void vcd_close(vcd_input_class_t *class);
 #if LIBVCD_VERSION_NUM >= 23
-static void send_mouse_enter_leave_event(vcd_input_plugin_t *p_this, 
+static void send_mouse_enter_leave_event(vcd_input_plugin_t *p_this,
                                          bool b_mouse_in);
 #endif
 
-/* 
-   If class->vcd_device is NULL or the empty string, 
-   Use libcdio to find a CD drive with a VCD in it. 
+/*
+   If class->vcd_device is NULL or the empty string,
+   Use libcdio to find a CD drive with a VCD in it.
 */
 static bool
 vcd_get_default_device(vcd_input_class_t *class, bool log_msg_if_fail)
@@ -184,7 +184,7 @@
 
   if (NULL == class->vcd_device || strlen(class->vcd_device)==0) {
     char **cd_drives=NULL;
-    cd_drives = cdio_get_devices_with_cap(NULL, 
+    cd_drives = cdio_get_devices_with_cap(NULL,
 (CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD|CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN),
 					true);
     if (NULL == cd_drives || NULL == cd_drives[0]) {
@@ -201,8 +201,8 @@
 }
 
 
[... 1373 lines omitted ...]
 _("range that the stream playback position slider represents playing a VCD."),
-                            10, 
+                            10,
                             vcd_slider_length_cb, NULL);
 
 #if READAHEAD_FINISHED
-    my_vcd.player.readahead = 
+    my_vcd.player.readahead =
       config->register_bool(config, "vcd.use_readahead",
                             (int) false,
                             _("VCD read-ahead caching?"),
@@ -1846,29 +1846,29 @@
                             vcd_read_ahead_cb, NULL);
 #endif
 
-  my_vcd.player.autoadvance = 
-    config->register_bool(config, 
+  my_vcd.player.autoadvance =
+    config->register_bool(config,
                         "media.vcd.autoadvance",
                         (int) true,
                         _("automatically advance VCD track/entry"),
 _("If enabled, we should automatically advance to the next entry or track. Used only when playback control (PBC) is disabled."),
-                        10, 
-                        vcd_autoadvance_cb, 
-                        NULL); 
+                        10,
+                        vcd_autoadvance_cb,
+                        NULL);
 
-  my_vcd.player.show_rejected = 
-    config->register_bool(config, 
+  my_vcd.player.show_rejected =
+    config->register_bool(config,
                         "media.vcd.show_rejected",
                         (int) false,
                         _("show 'rejected' VCD LIDs"),
 _("Some playback list IDs (LIDs) are marked not showable, "
 "but you can see them in the MRL list if this is set. Rejected entries "
 "are marked with an asterisk (*) appended to the MRL."),
-                        10, 
-                        vcd_show_rejected_cb, 
-                        NULL); 
+                        10,
+                        vcd_show_rejected_cb,
+                        NULL);
 
-  my_vcd.v_config.title_format = 
+  my_vcd.v_config.title_format =
     strdup(config->register_string(config,
                           "media.vcd.title_format",
                           "%F - %I %N%L%S, disk %c of %C - %v %A",
@@ -1894,7 +1894,7 @@
                           vcd_title_format_changed_cb,
                           NULL));
 
-  my_vcd.v_config.comment_format = 
+  my_vcd.v_config.comment_format =
     strdup(config->register_string(config,
                           "media.vcd.comment_format",
                           "%P - Track %T",
@@ -1907,8 +1907,8 @@
                           vcd_comment_format_changed_cb,
                           NULL));
 
-  vcdplayer_debug = 
-  config->register_num(config, 
+  vcdplayer_debug =
+  config->register_num(config,
                        "media.vcd.debug",
                        0,
                        _("VCD debug flag mask"),
@@ -1927,12 +1927,12 @@
 "2048: Debugging from VCDINFO\n"
 ),
                         20,
-                        vcd_debug_cb, 
-                        class); 
+                        vcd_debug_cb,
+                        class);
   }
-  
+
   gl_default_vcd_log_handler  = vcd_log_set_handler (uninit_log_handler);
-  gl_default_cdio_log_handler = 
+  gl_default_cdio_log_handler =
     cdio_log_set_handler ((cdio_log_handler_t) uninit_log_handler);
 
   my_vcd.input_plugin.open               = vcd_plugin_open;
@@ -1952,7 +1952,7 @@
   my_vcd.class                           = class;
   my_vcd.i_mouse_button                  = -1;
   my_vcd.b_mouse_in                      = false;
-  
+
   my_vcd.player.psz_source               = NULL;
 
   my_vcd.player.b_opened                 = false;
@@ -1964,11 +1964,11 @@
   return class;
 }
 
-/* 
+/*
    Exported plugin catalog entries.
 
    All plugins listing only the current API number break when the API
-   number is increased. This is by design. 
+   number is increased. This is by design.
 
    Sometimes in the rush to get out a buggy release, the API number is
    increased without communication let alone a concern for whether it
@@ -1985,13 +1985,13 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, (char *) SHORT_PLUGIN_NAME,
     XINE_VERSION_CODE, NULL, vcd_init },
   { PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL }
 };
 
-/* 
+/*
  * Local variables:
  *  c-file-style: "gnu"
  *  tab-width: 8

diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c
--- a/src/libreal/real_common.c
+++ b/src/libreal/real_common.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2007 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -132,8 +132,8 @@
 
 #endif
 
-  real_codecs_path = 
-    xine->config->register_filename (xine->config, "decoder.external.real_codecs_path", 
+  real_codecs_path =
+    xine->config->register_filename (xine->config, "decoder.external.real_codecs_path",
 				     default_real_codecs_path,
 				     XINE_CONFIG_STRING_IS_DIRECTORY_NAME,
 				     _("path to RealPlayer codecs"),
@@ -154,7 +154,7 @@
 			 const char *const codec_alternate) {
   char *codecpath = NULL;
   void *codecmodule = NULL;
-  
+
   asprintf(&codecpath, "%s/%s", path, codec_name);
   if ( (codecmodule = dlopen(codecpath, RTLD_NOW)) ) {
     free(codecpath);
@@ -178,12 +178,12 @@
   }
 
   _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL);
-  
+
   return NULL;
 }
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec },
   { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
diff --git a/src/libreal/real_common.h b/src/libreal/real_common.h
--- a/src/libreal/real_common.h
+++ b/src/libreal/real_common.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2007 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -26,7 +26,7 @@
 #include <xine/xine_internal.h>
 
 /*
- * some fake functions to make real codecs happy 
+ * some fake functions to make real codecs happy
  * These are, on current date (20070316) needed only for Alpha
  * codecs.
  * As they are far from being proper replacements, define them only there
diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
--- a/src/libreal/xine_real_audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * thin layer to use real binary-only codecs in xine
  *
- * code inspired by work from Florian Schneider for the MPlayer Project 
+ * code inspired by work from Florian Schneider for the MPlayer Project
  */
 
 #ifdef HAVE_CONFIG_H
@@ -92,7 +92,7 @@
   uint64_t         pts;
 
   int              output_open;
-  
+
   int              decoder_ok;
 
 } realdec_decoder_t;
@@ -130,7 +130,7 @@
   if (!this->raCloseCodec || !this->raDecode || !this->raFlush || !this->raFreeDecoder ||
       !this->raGetFlavorProperty || !this->raOpenCodec2 || !this->raSetFlavor ||
       /*!raSetDLLAccessPath ||*/ !this->raInitDecoder){
-    xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
 	     _("libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"), codec_name);
     return 0;
   }
@@ -162,7 +162,7 @@
   int   coded_frame_size2, data_len, flavor;
   int   mode;
   void *extras;
-  
+
   /*
    * extract header data
    */
@@ -173,13 +173,13 @@
 #ifdef LOG
   xine_hexdump (buf->content, buf->size);
 #endif
-    
+
   flavor           = _X_BE_16 (buf->content+22);
   coded_frame_size = _X_BE_32 (buf->content+24);
   codec_data_length= _X_BE_16 (buf->content+40);
   coded_frame_size2= _X_BE_16 (buf->content+42);
   subpacket_size   = _X_BE_16 (buf->content+44);
-    
+
   this->sps        = subpacket_size;
   this->w          = coded_frame_size2;
   this->h          = codec_data_length;
@@ -191,8 +191,8 @@
 
     /* FIXME: */
     if (buf->type==BUF_AUDIO_COOK) {
-      
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+
+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	       "libareal: audio header version 4 for COOK audio not supported.\n");
       return 0;
     }
@@ -210,7 +210,7 @@
   this->block_align= coded_frame_size2;
 
   lprintf ("0x%04x 0x%04x 0x%04x 0x%04x data_len 0x%04x\n",
-	   subpacket_size, coded_frame_size, codec_data_length, 
+	   subpacket_size, coded_frame_size, codec_data_length,
 	   coded_frame_size2, data_len);
   lprintf ("%d samples/sec, %d bits/sample, %d channels\n",
 	   samples_per_sec, bits_per_sample, num_channels);
@@ -224,7 +224,7 @@
       return 0;
     this->block_align = subpacket_size;
     break;
-    
+
   case BUF_AUDIO_ATRK:
     _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac");
     if (!load_syms_linux (this, "atrc.so", "atrc.so.6.0"))
@@ -252,7 +252,7 @@
     break;
 
   default:
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "libareal: error, i don't handle buf type 0x%08x\n", buf->type);
     return 0;
   }
@@ -267,7 +267,7 @@
     return 0;
   }
 
-  { 
+  {
     ra_init_t init_data;
 
     init_data.samplerate = samples_per_sec;
@@ -285,10 +285,10 @@
     printf ("libareal: extras :\n");
     xine_hexdump (init_data.extras, data_len);
 #endif
-     
+
     result = this->raInitDecoder (this->context, &init_data);
     if(result){
-      xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
+      xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
 	       _("libareal: decoder init failed, error code: 0x%x\n"), result);
       return 0;
     }
@@ -344,7 +344,7 @@
     return 0;
   }
 
-  (this->stream->audio_out->open) (this->stream->audio_out, 
+  (this->stream->audio_out->open) (this->stream->audio_out,
 				this->stream,
 				bits_per_sample,
 				samples_per_sec,
@@ -360,7 +360,7 @@
 static void realdec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
 
-  lprintf ("decode_data %d bytes, flags=0x%08x, pts=%"PRId64" ...\n", 
+  lprintf ("decode_data %d bytes, flags=0x%08x, pts=%"PRId64" ...\n",
 	   buf->size, buf->decoder_flags, buf->pts);
 
   if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
@@ -407,20 +407,20 @@
 
 	  audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
 
-	  result = this->raDecode (this->context, 
+	  result = this->raDecode (this->context,
 				   this->frame_buffer + n,
 				   this->block_align,
 				   (char *) audio_buffer->mem, &len, -1);
 
 	  lprintf ("raDecode result %d, len=%d\n", result, len);
 
-	  audio_buffer->vpts       = this->pts; 
+	  audio_buffer->vpts       = this->pts;
 
 	  this->pts = 0;
 
 	  audio_buffer->num_frames = len/this->sample_size;;
-	  
-	  this->stream->audio_out->put_buffer (this->stream->audio_out, 
+
+	  this->stream->audio_out->put_buffer (this->stream->audio_out,
 					       audio_buffer, this->stream);
 	  n += this->block_align;
 	}
@@ -433,13 +433,13 @@
 
 static void realdec_reset (audio_decoder_t *this_gen) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
-  
+
   this->frame_num_bytes = 0;
 }
 
 static void realdec_discontinuity (audio_decoder_t *this_gen) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
-  
+
   this->pts = 0;
 }
 
@@ -475,7 +475,7 @@
   lprintf ("dispose done\n");
 }
 
-static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, 
+static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
 				     xine_stream_t *stream) {
 
   real_class_t      *cls = (real_class_t *) class_gen;
@@ -518,7 +518,7 @@
  * exported plugin catalog entry
  */
 
-static const uint32_t audio_types[] = { 
+static const uint32_t audio_types[] = {
   BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0
  };
 
diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c
--- a/src/libreal/xine_real_video_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * thin layer to use real binary-only codecs in xine
  *
- * code inspired by work from Florian Schneider for the MPlayer Project 
+ * code inspired by work from Florian Schneider for the MPlayer Project
  */
 
 #ifdef HAVE_CONFIG_H
@@ -149,12 +149,12 @@
   this->rvyuv_hive_message   = dlsym (this->rv_handle, "RV20toYUV420HiveMessage");
   this->rvyuv_init           = dlsym (this->rv_handle, "RV20toYUV420Init");
   this->rvyuv_transform      = dlsym (this->rv_handle, "RV20toYUV420Transform");
-  
+
   if (this->rvyuv_custom_message &&
       this->rvyuv_free &&
       this->rvyuv_hive_message &&
       this->rvyuv_init &&
-      this->rvyuv_transform) 
+      this->rvyuv_transform)
     return 1;
 
   this->rvyuv_custom_message = dlsym (this->rv_handle, "RV40toYUV420CustomMessage");
@@ -162,15 +162,15 @@
   this->rvyuv_hive_message   = dlsym (this->rv_handle, "RV40toYUV420HiveMessage");
   this->rvyuv_init           = dlsym (this->rv_handle, "RV40toYUV420Init");
   this->rvyuv_transform      = dlsym (this->rv_handle, "RV40toYUV420Transform");
-  
+
   if (this->rvyuv_custom_message &&
       this->rvyuv_free &&
       this->rvyuv_hive_message &&
       this->rvyuv_init &&
-      this->rvyuv_transform) 
+      this->rvyuv_transform)
     return 1;
 
-  xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
+  xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
 	   _("libreal: Error resolving symbols! (version incompatibility?)\n"));
   return 0;
 }
@@ -198,17 +198,17 @@
       return 0;
     break;
   default:
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "libreal: error, i don't handle buf type 0x%08x\n", buf->type);
     _x_abort();
   }
 
   init_data.w = _X_BE_16(&buf->content[12]);
   init_data.h = _X_BE_16(&buf->content[14]);
-  
+
   this->width  = (init_data.w + 1) & (~1);
   this->height = (init_data.h + 1) & (~1);
-  
+
   if(buf->decoder_flags & BUF_FLAG_ASPECT)
     this->ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
   else
@@ -216,15 +216,15 @@
 
   /* While the framerate is stored in the header it sometimes doesn't bear
    * much resemblence to the actual frequency of frames in the file. Hence
-   * it's better to just let the engine estimate the frame duration for us */ 
+   * it's better to just let the engine estimate the frame duration for us */
 #if 0
-  this->fps      = (double) _X_BE_16(&buf->content[22]) + 
+  this->fps      = (double) _X_BE_16(&buf->content[22]) +
                    ((double) _X_BE_16(&buf->content[24]) / 65536.0);
   this->duration = 90000.0 / this->fps;
 #endif
-  
+
   lprintf("this->ratio=%f\n", this->ratio);
-  
+
   lprintf ("init_data.w=%d(0x%x), init_data.h=%d(0x%x),"
 	   "this->width=%d(0x%x), this->height=%d(0x%x)\n",
 	   init_data.w, init_data.w,
@@ -238,22 +238,22 @@
 
   init_data.subformat = _X_BE_32(&buf->content[26]);
   init_data.format    = _X_BE_32(&buf->content[30]);
-  
+
 #ifdef LOG
   printf ("libreal: init_data for rvyuv_init:\n");
   xine_hexdump ((char *) &init_data, sizeof (init_data));
-  
+
   printf ("libreal: buf->content\n");
   xine_hexdump (buf->content, buf->size);
-#endif  
-  lprintf ("init codec %dx%d... %x %x\n", 
+#endif
+  lprintf ("init codec %dx%d... %x %x\n",
 	   init_data.w, init_data.h,
 	   init_data.subformat, init_data.format );
[... 29 lines omitted ...]
+
   (this->stream->video_out->open) (this->stream->video_out, this->stream);
-    
+
   this->frame_size   = this->width * this->height;
   this->frame_buffer = xine_xmalloc (this->width * this->height * 3 / 2);
-  
+
   this->chunk_buffer = calloc(1, BUF_SIZE);
   this->chunk_buffer_max = BUF_SIZE;
-  
+
   return 1;
 }
 
 static void realdec_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
 
-  lprintf ("decode_data, flags=0x%08x, len=%d, pts=%"PRId64" ...\n", 
+  lprintf ("decode_data, flags=0x%08x, len=%d, pts=%"PRId64" ...\n",
            buf->decoder_flags, buf->size, buf->pts);
 
   if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
     /* real_find_sequence_header (&this->real, buf->content, buf->content + buf->size);*/
     return;
   }
-  
+
   if (buf->decoder_flags & BUF_FLAG_FRAMERATE) {
     this->duration = buf->decoder_info[0];
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, 
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION,
                          this->duration);
   }
 
@@ -312,14 +312,14 @@
       _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0);
 
   } else if (this->decoder_ok && this->context) {
-  
+
     /* Each frame starts with BUF_FLAG_FRAME_START and ends with
      * BUF_FLAG_FRAME_END.
      * The last buffer contains the chunk offset table.
      */
 
     if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-    
+
       lprintf ("buffer (%d bytes)\n", buf->size);
 
       if (buf->decoder_flags & BUF_FLAG_FRAME_START) {
@@ -329,10 +329,10 @@
         this->pts = buf->pts;
         lprintf ("new frame starting, pts=%"PRId64"\n", this->pts);
       }
-      
+
       if ((this->chunk_buffer_size + buf->size) > this->chunk_buffer_max) {
         lprintf("increasing chunk buffer size\n");
-      
+
         this->chunk_buffer_max *= 2;
         this->chunk_buffer = realloc(this->chunk_buffer, this->chunk_buffer_max);
       }
@@ -345,9 +345,9 @@
 
     } else {
       /* end of frame, chunk table */
-     
+
       lprintf ("special buffer (%d bytes)\n", buf->size);
-      
+
       if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
 
         int            result;
@@ -383,7 +383,7 @@
         xine_hexdump ((uint8_t *) &transform_in, sizeof(rv_xform_in_t));
 
         printf ("libreal: chunk_table:\n");
-        xine_hexdump ((uint8_t *) buf->decoder_info_ptr[2], 
+        xine_hexdump ((uint8_t *) buf->decoder_info_ptr[2],
                       2*(buf->decoder_info[2]+1)*sizeof(uint32_t));
 #endif
 
@@ -458,13 +458,13 @@
 
 static void realdec_reset (video_decoder_t *this_gen) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
-  
+
   this->chunk_buffer_size = 0;
 }
 
 static void realdec_discontinuity (video_decoder_t *this_gen) {
   realdec_decoder_t *this = (realdec_decoder_t *) this_gen;
-  
+
   this->pts = 0;
 }
 
@@ -480,21 +480,21 @@
   if (this->rvyuv_free && this->context)
     this->rvyuv_free (this->context);
 
-  if (this->rv_handle) 
+  if (this->rv_handle)
     dlclose (this->rv_handle);
 
   if (this->frame_buffer)
     free (this->frame_buffer);
-    
+
   if (this->chunk_buffer)
     free (this->chunk_buffer);
-    
+
   free (this);
 
   lprintf ("dispose done\n");
 }
 
-static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, 
+static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
 				     xine_stream_t *stream) {
 
   real_class_t      *cls = (real_class_t *) class_gen;

diff --git a/src/libw32dll/DirectShow/DS_AudioDecoder.c b/src/libw32dll/DirectShow/DS_AudioDecoder.c
--- a/src/libw32dll/DirectShow/DS_AudioDecoder.c
+++ b/src/libw32dll/DirectShow/DS_AudioDecoder.c
@@ -15,7 +15,7 @@
 #include "DS_Filter.h"
 
 struct _DS_AudioDecoder
-{ 
+{
     WAVEFORMATEX in_fmt;
     AM_MEDIA_TYPE m_sOurType, m_sDestType;
     DS_Filter* m_pDS_Filter;
@@ -46,20 +46,20 @@
 #endif
 
     this = malloc(sizeof(DS_AudioDecoder));
-    
+
     sz = 18 + wf->cbSize;
     this->m_sVhdr = malloc(sz);
     memcpy(this->m_sVhdr, wf, sz);
     this->m_sVhdr2 = malloc(18);
     memcpy(this->m_sVhdr2, this->m_sVhdr, 18);
-    
+
     pWF = (WAVEFORMATEX*)this->m_sVhdr2;
     pWF->wFormatTag = 1;
     pWF->wBitsPerSample = 16;
     pWF->nBlockAlign = pWF->nChannels * (pWF->wBitsPerSample + 7) / 8;
     pWF->cbSize = 0;
     pWF->nAvgBytesPerSec = pWF->nBlockAlign * pWF->nSamplesPerSec;
-    
+
     memcpy(&this->in_fmt,wf,sizeof(WAVEFORMATEX));
 
     memset(&this->m_sOurType, 0, sizeof(this->m_sOurType));
@@ -105,7 +105,7 @@
            free(this);
            return NULL;
         }
-        
+
         this->m_pDS_Filter->Start(this->m_pDS_Filter);
 
 	props.cBuffers=1;
@@ -141,7 +141,7 @@
 {
     unsigned int written = 0;
     unsigned int read = 0;
-        
+
     if (!in_data || !out_data)
 	return -1;
 
@@ -157,7 +157,7 @@
 	IMediaSample* sample=0;
 	char* ptr;
 	int result;
-	
+
 //	this->m_pOurOutput->SetFramePointer(out_data+written);
 	this->m_pDS_Filter->m_pOurOutput->SetFramePointer(this->m_pDS_Filter->m_pOurOutput,&frame_pointer);
 	this->m_pDS_Filter->m_pOurOutput->SetFrameSizePointer(this->m_pDS_Filter->m_pOurOutput,(long*)&frame_size);
@@ -198,7 +198,7 @@
     double efficiency =(double) this->in_fmt.nAvgBytesPerSec
 	/ (this->in_fmt.nSamplesPerSec*this->in_fmt.nBlockAlign);
     int frames = (int)(dest_size*efficiency);;
-    
+
     if (frames < 1)
 	frames = 1;
     return frames * this->in_fmt.nBlockAlign;
diff --git a/src/libw32dll/DirectShow/DS_VideoDecoder.c b/src/libw32dll/DirectShow/DS_VideoDecoder.c
--- a/src/libw32dll/DirectShow/DS_VideoDecoder.c
+++ b/src/libw32dll/DirectShow/DS_VideoDecoder.c
@@ -18,7 +18,7 @@
 struct _DS_VideoDecoder
 {
     IVideoDecoder iv;
-    
+
     DS_Filter* m_pDS_Filter;
     AM_MEDIA_TYPE m_sOurType, m_sDestType;
     VIDEOINFOHEADER* m_sVhdr;
@@ -59,7 +59,7 @@
 
 int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this)
 {return this->m_Caps;}
-	    
+
 typedef struct _ct ct;
 
 struct _ct {
@@ -68,7 +68,7 @@
 		const GUID *subtype;
 		int cap;
 	    };
-            
+
 static ct check[] = {
 		{16, fccYUY2, &MEDIASUBTYPE_YUY2, CAP_YUY2},
 		{12, fccIYUV, &MEDIASUBTYPE_IYUV, CAP_IYUV},
@@ -87,10 +87,10 @@
     DS_VideoDecoder *this;
     HRESULT result;
     ct* c;
-                        
+
     this = malloc(sizeof(DS_VideoDecoder));
     memset( this, 0, sizeof(DS_VideoDecoder));
-    
+
     this->m_sVhdr2 = 0;
     this->m_iLastQuality = -1;
     this->m_iMaxAuto = maxauto;
@@ -104,10 +104,10 @@
     /*try*/
     {
         unsigned int bihs;
-        
+
 	bihs = (format->biSize < (int) sizeof(BITMAPINFOHEADER)) ?
 	    sizeof(BITMAPINFOHEADER) : format->biSize;
-     
+
         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
         memcpy(this->iv.m_bh, format, bihs);
         this->iv.m_bh->biSize = bihs;
@@ -119,7 +119,7 @@
         this->iv.m_iPlaypos = -1;
         this->iv.m_fQuality = 0.0f;
         this->iv.m_bCapable16b = true;
-                
+
         bihs += sizeof(VIDEOINFOHEADER) - sizeof(BITMAPINFOHEADER);
 	this->m_sVhdr = (VIDEOINFOHEADER*)malloc(bihs);
 	memset(this->m_sVhdr, 0, bihs);
@@ -159,7 +159,7 @@
 	this->m_sDestType.pUnk = 0;
 	this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
 	this->m_sDestType.pbFormat = (char*)this->m_sVhdr2;
-        
+
         memset(&this->iv.m_obh, 0, sizeof(this->iv.m_obh));
 	memcpy(&this->iv.m_obh, this->iv.m_bh, sizeof(this->iv.m_obh) < (unsigned) this->iv.m_bh->biSize
 	       ? sizeof(this->iv.m_obh) : (unsigned) this->iv.m_bh->biSize);
@@ -172,7 +172,7 @@
 
 
 	this->m_pDS_Filter = DS_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType);
-	
+
 	if (!this->m_pDS_Filter)
 	{
 	    printf("Failed to create DirectShow filter\n");
@@ -216,7 +216,7 @@
 	    break;
 #endif
 	default:
-              
+
 	    this->m_Caps = CAP_NONE;
 
 	    printf("Decoder supports the following YUV formats: ");
@@ -278,7 +278,7 @@
     Debug printf("DS_VideoDecoder_StartInternal\n");
     //cout << "DSSTART" << endl;
     this->m_pDS_Filter->Start(this->m_pDS_Filter);
-    
+
     props.cBuffers = 1;
     props.cbBuffer = this->m_sDestType.lSampleSize;
 
@@ -286,7 +286,7 @@
     props.cbAlign = props.cbPrefix = 0;
     this->m_pDS_Filter->m_pAll->vt->SetProperties(this->m_pDS_Filter->m_pAll, &props, &props1);
     this->m_pDS_Filter->m_pAll->vt->Commit(this->m_pDS_Filter->m_pAll);
-    
+
     this->iv.m_State = START;
 }
 
@@ -301,17 +301,17 @@
     IMediaSample* sample = 0;
     char* ptr;
     int result;
-    
+
     Debug printf("DS_VideoDecoder_DecodeInternal(%p,%p,%d,%d,%p)\n",this,src,size,is_keyframe,pImage);
-            
+
     this->m_pDS_Filter->m_pAll->vt->GetBuffer(this->m_pDS_Filter->m_pAll, &sample, 0, 0, 0);
-    
+
     if (!sample)
     {
 	Debug printf("ERROR: null sample\n");
 	return -1;
     }
-    
[... 36 lines omitted ...]
 	    }
-            
+
             if( bits == 16 ) {
 	      this->iv.m_obh.colors[0]=0xF800;
 	      this->iv.m_obh.colors[1]=0x07E0;
@@ -514,7 +514,7 @@
 
         if (ok) {
 	  if (csp != 0 && csp != 3 && this->iv.m_obh.biHeight > 0)
-    	    this->iv.m_obh.biHeight *= -1; // YUV formats uses should have height < 0
+	    this->iv.m_obh.biHeight *= -1; // YUV formats uses should have height < 0
 	  this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER);
 	  this->iv.m_obh.biCompression=csp;
 	  this->iv.m_obh.biBitCount=bits;
@@ -578,9 +578,9 @@
 	memcpy(&(this->m_sVhdr2->bmiHeader), &this->iv.m_decoder, sizeof(this->iv.m_decoder));
 	this->m_sVhdr2->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
 	if (this->m_sVhdr2->bmiHeader.biCompression == 3)
-    	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12;
+	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12;
 	else
-    	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
+	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
 
 	return -1;
     }
@@ -624,7 +624,7 @@
     if (stoped)
     {
 	DS_VideoDecoder_StartInternal(this);
-        this->iv.m_State = START; 
+        this->iv.m_State = START;
     }
 
     return 0;
@@ -789,7 +789,7 @@
 // get4=set3 73
 // get5=set4 19
 	// get6=set5 23
-    	hidden = (IHidden*)((int)this->m_pDS_Filter->m_pFilter + 0xb8);
+	hidden = (IHidden*)((int)this->m_pDS_Filter->m_pFilter + 0xb8);
 //	printf("DS_SetValue for DIVX, name=%s  value=%d\n",name,value);
 	if (strcmp(name, "Quality") == 0)
 	{
@@ -810,7 +810,7 @@
 	}
         return 0;
     }
-#if 0    
+#if 0
     if (strcmp((const char*)record.dll, "ir50_32.dll") == 0)
     {
 	IHidden2* hidden = 0;
@@ -844,7 +844,7 @@
 	if(!recordpar[5])
 	{
 	    hidden->vt->Release((IUnknown*)hidden);
-    	    return -1;
+	    return -1;
 	}
 	HRESULT result = hidden->vt->DecodeSet(hidden, recordpar);
 	hidden->vt->Release((IUnknown*)hidden);
@@ -865,28 +865,28 @@
     int result, status, newkey, count;
         if(strcmp(attribute, "Quality")==0){
 	    char* keyname="SOFTWARE\\Microsoft\\Scrunch";
-    	    result=RegCreateKeyExA(HKEY_CURRENT_USER, keyname, 0, 0, 0, 0, 0,	   		&newkey, &status);
+	    result=RegCreateKeyExA(HKEY_CURRENT_USER, keyname, 0, 0, 0, 0, 0,			&newkey, &status);
             if(result!=0)
 	    {
 	        printf("VideoDecoder::SetExtAttr: registry failure\n");
 	        return -1;
-	    }    
+	    }
 	    result=RegSetValueExA(newkey, "Current Post Process Mode", 0, REG_DWORD, &value, 4);
             if(result!=0)
 	    {
 	        printf("VideoDecoder::SetExtAttr: error writing value\n");
 	        return -1;
-	    }    
+	    }
 	    value=-1;
 	    result=RegSetValueExA(newkey, "Force Post Process Mode", 0, REG_DWORD, &value, 4);
             if(result!=0)
 	    {
 		printf("VideoDecoder::SetExtAttr: error writing value\n");
-	    	return -1;
-	    }    
-   	    RegCloseKey(newkey);
-   	    return 0;
-	}   	
+		return -1;
+	    }
+	    RegCloseKey(newkey);
+	    return 0;
+	}
 
         if(
 	(strcmp(attribute, "Saturation")==0) ||
@@ -896,21 +896,21 @@
 	)
         {
 	    char* keyname="SOFTWARE\\Microsoft\\Scrunch\\Video";
-    	    result=RegCreateKeyExA(HKEY_CURRENT_USER, keyname, 0, 0, 0, 0, 0,	   		&newkey, &status);
+	    result=RegCreateKeyExA(HKEY_CURRENT_USER, keyname, 0, 0, 0, 0, 0,			&newkey, &status);
             if(result!=0)
 	    {
 	        printf("VideoDecoder::SetExtAttr: registry failure\n");
 	        return -1;
-	    }    
+	    }
 	    result=RegSetValueExA(newkey, attribute, 0, REG_DWORD, &value, 4);
             if(result!=0)
 	    {
 	        printf("VideoDecoder::SetExtAttr: error writing value\n");
 	        return -1;
-	    }    
-   	    RegCloseKey(newkey);
-   	    return 0;
-	}   	
+	    }
+	    RegCloseKey(newkey);
+	    return 0;
+	}
 
         printf("Unknown attribute!\n");
         return -200;

diff --git a/src/libw32dll/DirectShow/iunk.h b/src/libw32dll/DirectShow/iunk.h
--- a/src/libw32dll/DirectShow/iunk.h
+++ b/src/libw32dll/DirectShow/iunk.h
@@ -11,39 +11,39 @@
 #define DECLARE_IUNKNOWN() \
     int refcount;
 
-#define IMPLEMENT_IUNKNOWN(CLASSNAME) 		\
+#define IMPLEMENT_IUNKNOWN(CLASSNAME)		\
 static long STDCALL CLASSNAME ## _QueryInterface(IUnknown * This, \
 					  const GUID* riid, void **ppvObject) \
 { \
     CLASSNAME * me = (CLASSNAME *)This;		\
     const GUID* r; unsigned int i = 0;		\
     Debug printf(#CLASSNAME "_QueryInterface(%p) called\n", This);\
-    if (!ppvObject) return E_POINTER; 		\
+    if (!ppvObject) return E_POINTER;		\
     for(r=me->interfaces; i<sizeof(me->interfaces)/sizeof(me->interfaces[0]); r++, i++) \
 	if(!memcmp(r, riid, sizeof(*r)))	\
-	{ 					\
-	    me->vt->AddRef((IUnknown*)This); 	\
-	    *ppvObject=This; 			\
-	    return 0; 				\
-	} 					\
+	{					\
+	    me->vt->AddRef((IUnknown*)This);	\
+	    *ppvObject=This;			\
+	    return 0;				\
+	}					\
     Debug printf("Query failed! (GUID: 0x%x)\n", *(const unsigned int*)riid); \
     return E_NOINTERFACE;			\
-} 						\
+}						\
 						\
 static long STDCALL CLASSNAME ## _AddRef(IUnknown * This) \
 {						\
     CLASSNAME * me=( CLASSNAME *)This;		\
     Debug printf(#CLASSNAME "_AddRef(%p) called (ref:%d)\n", This, me->refcount); \
-    return ++(me->refcount); 			\
-}     						\
+    return ++(me->refcount);			\
+}						\
 						\
 static long STDCALL CLASSNAME ## _Release(IUnknown * This) \
-{ 						\
-    CLASSNAME* me=( CLASSNAME *)This;	 	\
+{						\
+    CLASSNAME* me=( CLASSNAME *)This;		\
     Debug printf(#CLASSNAME "_Release(%p) called (new ref:%d)\n", This, me->refcount - 1); \
     if(--(me->refcount) == 0)			\
-		CLASSNAME ## _Destroy(me); 	\
-    return 0; 					\
+		CLASSNAME ## _Destroy(me);	\
+    return 0;					\
 }
 
 #endif /* DS_IUNK_H */
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -5,7 +5,7 @@
 AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\"
 AM_LDFLAGS  = $(xineplug_ldflags)
 
-SUBDIRS = 
+SUBDIRS =
 if ENABLE_W32DLL
 SUBDIRS += wine DirectShow dmo qtx
 endif
diff --git a/src/libw32dll/common.c b/src/libw32dll/common.c
--- a/src/libw32dll/common.c
+++ b/src/libw32dll/common.c
@@ -6,7 +6,7 @@
   DIR                *dir;
   char               *path, *cfgpath;
   char               *listpath[] = { "",
-                                     "/usr/lib/codecs", 
+                                     "/usr/lib/codecs",
                                      "/usr/local/lib/codecs",
                                      "/usr/lib/win32",
                                      "/usr/local/lib/win32",
@@ -35,5 +35,5 @@
     i++;
   }
 
-  return NULL; 
+  return NULL;
 }
diff --git a/src/libw32dll/dmo/DMO_AudioDecoder.c b/src/libw32dll/dmo/DMO_AudioDecoder.c
--- a/src/libw32dll/dmo/DMO_AudioDecoder.c
+++ b/src/libw32dll/dmo/DMO_AudioDecoder.c
@@ -19,7 +19,7 @@
 #include "DMO_AudioDecoder.h"
 
 struct _DMO_AudioDecoder
-{ 
+{
     DMO_MEDIA_TYPE m_sOurType, m_sDestType;
     DMO_Filter* m_pDMO_Filter;
     char* m_sVhdr;
@@ -49,17 +49,17 @@
     Setup_LDT_Keeper();
     Setup_FS_Segment();
 #endif
-        
+
     this = malloc(sizeof(DMO_AudioDecoder));
-    
+
     this->m_iFlushed=1;
-    
+
     sz = 18 + wf->cbSize;
     this->m_sVhdr = malloc(sz);
     memcpy(this->m_sVhdr, wf, sz);
     this->m_sVhdr2 = malloc(18);
     memcpy(this->m_sVhdr2, this->m_sVhdr, 18);
-    
+
     pWF = (WAVEFORMATEX*)this->m_sVhdr2;
     pWF->wFormatTag = 1;
     pWF->wBitsPerSample = 16;
@@ -67,7 +67,7 @@
     pWF->nBlockAlign = 2*pWF->nChannels; //pWF->nChannels * (pWF->wBitsPerSample + 7) / 8;
     pWF->nAvgBytesPerSec = pWF->nBlockAlign * pWF->nSamplesPerSec;
     pWF->cbSize = 0;
-    
+
     memset(&this->m_sOurType, 0, sizeof(this->m_sOurType));
     this->m_sOurType.majortype=MEDIATYPE_Audio;
     this->m_sOurType.subtype=MEDIASUBTYPE_PCM;
@@ -101,7 +101,7 @@
            free(this);
            return NULL;
         }
-        
+
     return this;
 }
 
@@ -129,7 +129,7 @@
 #ifdef LDT_paranoia
     Setup_FS_Segment();
 #endif
-                
+
     //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 1);
     bufferin = CMediaBufferCreate(in_size, (void*)in_data, in_size, 1);
     r = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0,
@@ -157,7 +157,7 @@
 
 	((IMediaBuffer*)db.pBuffer)->vt->GetBufferAndLength((IMediaBuffer*)db.pBuffer, 0, &written);
 	((IMediaBuffer*)db.pBuffer)->vt->Release((IUnknown*)db.pBuffer);
- 
+
 	//printf("RESULTB: %d 0x%x %ld\n", r, r, written);
 	//printf("Converted  %d  -> %d\n", in_size, out_size);
     }
diff --git a/src/libw32dll/dmo/DMO_VideoDecoder.c b/src/libw32dll/dmo/DMO_VideoDecoder.c
--- a/src/libw32dll/dmo/DMO_VideoDecoder.c
+++ b/src/libw32dll/dmo/DMO_VideoDecoder.c
@@ -24,7 +24,7 @@
 struct _DMO_VideoDecoder
 {
     IVideoDecoder iv;
-    
+
     DMO_Filter* m_pDMO_Filter;
     AM_MEDIA_TYPE m_sOurType, m_sDestType;
     VIDEOINFOHEADER* m_sVhdr;
@@ -72,7 +72,7 @@
     const GUID* subtype;
     int cap;
 	    };
-            
+
 static ct check[] = {
     { fccI420, 12, &MEDIASUBTYPE_I420, CAP_I420 },
     { fccYV12, 12, &MEDIASUBTYPE_YV12, CAP_YV12 },
@@ -95,10 +95,10 @@
     DMO_VideoDecoder *this;
     HRESULT result;
     ct* c;
-                        
+
     this = malloc(sizeof(DMO_VideoDecoder));
     memset( this, 0, sizeof(DMO_VideoDecoder));
-    
+
     this->m_sVhdr2 = 0;
     this->m_iLastQuality = -1;
     this->m_iMaxAuto = maxauto;
@@ -112,10 +112,10 @@
     /*try*/
     {
         unsigned int bihs;
-        
+
 	bihs = (format->biSize < (int) sizeof(BITMAPINFOHEADER)) ?
 	    sizeof(BITMAPINFOHEADER) : format->biSize;
-     
+
         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
         memcpy(this->iv.m_bh, format, bihs);
         this->iv.m_bh->biSize = bihs;
@@ -127,7 +127,7 @@
         this->iv.m_iPlaypos = -1;
         this->iv.m_fQuality = 0.0f;
         this->iv.m_bCapable16b = true;
-                
+
         bihs += sizeof(VIDEOINFOHEADER) - sizeof(BITMAPINFOHEADER);
 	this->m_sVhdr = (VIDEOINFOHEADER*)malloc(bihs);
 	memset(this->m_sVhdr, 0, bihs);
@@ -171,7 +171,7 @@
 	this->m_sDestType.pUnk = 0;
 	this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
 	this->m_sDestType.pbFormat = (char*)this->m_sVhdr2;
-        
+
         memset(&this->iv.m_obh, 0, sizeof(this->iv.m_obh));
 	memcpy(&this->iv.m_obh, this->iv.m_bh, sizeof(this->iv.m_obh) < (unsigned) this->iv.m_bh->biSize
 	       ? sizeof(this->iv.m_obh) : (unsigned) this->iv.m_bh->biSize);
@@ -184,7 +184,7 @@
 
 
 	this->m_pDMO_Filter = DMO_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType);
-	
+
 	if (!this->m_pDMO_Filter)
 	{
 	    printf("Failed to create DMO filter\n");
@@ -229,7 +229,7 @@
 	    break;
 #endif
 	default:
-              
+
 	    this->m_Caps = CAP_NONE;
 
 	    printf("Decoder supports the following YUV formats: ");
@@ -284,7 +284,7 @@
     Debug printf("DMO_VideoDecoder_StartInternal\n");
     //cout << "DSSTART" << endl;
     this->m_pDMO_Filter->Start(this->m_pDMO_Filter);
-    
+
     props.cBuffers = 1;
     props.cbBuffer = this->m_sDestType.lSampleSize;
 
@@ -292,7 +292,7 @@
     props.cbAlign = props.cbPrefix = 0;
     this->m_pDMO_Filter->m_pAll->vt->SetProperties(this->m_pDMO_Filter->m_pAll, &props, &props1);
     this->m_pDMO_Filter->m_pAll->vt->Commit(this->m_pDMO_Filter->m_pAll);
-#endif    
+#endif
     this->iv.m_State = START;
 }
 
@@ -310,7 +310,7 @@
     DMO_OUTPUT_DATA_BUFFER db;
     CMediaBuffer* bufferin;
 //+    uint8_t* imdata = dest ? dest->Data() : 0;
-    
+
     Debug printf("DMO_VideoDecoder_DecodeInternal(%p,%p,%d,%d,%p)\n",this,src,size,is_keyframe,imdata);
 
 //    this->m_pDMO_Filter->m_pAll->vt->GetBuffer(this->m_pDMO_Filter->m_pAll, &sample, 0, 0, 0);
@@ -371,14 +371,14 @@
 {
     HRESULT result;
     int should_test=1;
-    
+
     Debug printf("DMO_VideoDecoder_SetDestFmt (%p, %d, %d)\n",this,bits,(int)csp);
-        
+
        /* if (!CImage::Supported(csp, bits))
 	return -1;
 */
     // BitmapInfo temp = m_obh;
-    
+
     if (!csp)	// RGB
     {
 	int ok = true;
@@ -387,7 +387,7 @@
         {
 	case 15:
 	    this->m_sDestType.subtype = MEDIASUBTYPE_RGB555;
-    	    break;
+	    break;
 	case 16:
 	    this->m_sDestType.subtype = MEDIASUBTYPE_RGB565;
 	    break;
@@ -409,7 +409,7 @@
 	      this->iv.m_obh.biCompression=3;//BI_BITFIELDS
 	      this->iv.m_obh.biSizeImage=abs((int)(2*this->iv.m_obh.biWidth*this->iv.m_obh.biHeight));
 	    }
-            
+
             if( bits == 16 ) {
 	      this->iv.m_obh.colors[0]=0xF800;
 	      this->iv.m_obh.colors[1]=0x07E0;
@@ -459,7 +459,7 @@
 
         if (ok) {
 	  if (csp != 0 && csp != 3 && this->iv.m_obh.biHeight > 0)
-    	    this->iv.m_obh.biHeight *= -1; // YUV formats uses should have height < 0
+	    this->iv.m_obh.biHeight *= -1; // YUV formats uses should have height < 0
 	  this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER);
 	  this->iv.m_obh.biCompression=csp;
 	  this->iv.m_obh.biBitCount=bits;
@@ -532,9 +532,9 @@
 	memcpy(&(this->m_sVhdr2->bmiHeader), &this->iv.m_decoder, sizeof(this->iv.m_decoder));
 	this->m_sVhdr2->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
 	if (this->m_sVhdr2->bmiHeader.biCompression == 3)
-    	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12;
+	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12;
 	else
-    	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
+	    this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
 
 	return -1;
     }
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CFLAGS   = $(X_CFLAGS) -fno-omit-frame-pointer
 AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS -I$(srcdir)/.. -I$(srcdir)/../wine
- 
+
 noinst_HEADERS = \
 	DMO_AudioDecoder.h \
 	dmo_guids.h \
diff --git a/src/libw32dll/dmo/dmo.c b/src/libw32dll/dmo/dmo.c
--- a/src/libw32dll/dmo/dmo.c
+++ b/src/libw32dll/dmo/dmo.c
@@ -61,7 +61,7 @@
 //trapbug();
 	hr = func(id, &IID_IClassFactory, (void**)&factory);
 	if (hr || !factory)
-	{            
+	{
 	    em = "no such class object";
 	    break;
 	}
diff --git a/src/libw32dll/libwin32.h b/src/libw32dll/libwin32.h
--- a/src/libw32dll/libwin32.h
+++ b/src/libw32dll/libwin32.h
@@ -38,7 +38,7 @@
 typedef struct _CImage // public  your_libvo_mem
 {
     char* ptr;
-    
+
     /*char* (*Data)();
     {
 	return 0;
@@ -47,7 +47,7 @@
     /*int (*Supported)(fourcc_t csp, int bits);
     {
 	return true;
-	// if you support such surface 
+	// if you support such surface
     }*/
 }CImage;
 
@@ -105,18 +105,18 @@
 
 typedef struct _BitmapInfo
 {
-    long 	biSize;
-    long  	biWidth;
-    long  	biHeight;
-    short 	biPlanes;
-    short 	biBitCount;
-    long 	biCompression;
-    long 	biSizeImage;
-    long  	biXPelsPerMeter;
-    long  	biYPelsPerMeter;
-    long 	biClrUsed;
-    long 	biClrImportant;
-    int 	colors[3];    
+    long	biSize;
+    long	biWidth;
+    long	biHeight;
+    short	biPlanes;
+    short	biBitCount;
+    long	biCompression;
+    long	biSizeImage;
+    long	biXPelsPerMeter;
+    long	biYPelsPerMeter;
+    long	biClrUsed;
+    long	biClrImportant;
+    int	colors[3];
 } BitmapInfo;
 
 typedef struct _IVideoDecoder
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -110,19 +110,19 @@
 
 
 typedef int (__cdecl* LPFUNC1)(long flag);
-typedef int (__cdecl* LPFUNC2)(const SoundComponentData *, 
+typedef int (__cdecl* LPFUNC2)(const SoundComponentData *,
 			       const SoundComponentData *,
 			       SoundConverter *);
 typedef int (__cdecl* LPFUNC3)(SoundConverter sc);
 typedef int (__cdecl* LPFUNC4)(void);
 typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr);
-typedef int (__cdecl* LPFUNC6)(SoundConverter sc, 
+typedef int (__cdecl* LPFUNC6)(SoundConverter sc,
 			       unsigned long inputBytesTarget,
 			       unsigned long *inputFrames,
 			       unsigned long *inputBytes,
 			       unsigned long *outputBytes );
-typedef int (__cdecl* LPFUNC7)(SoundConverter sc, 
-			       const void    *inputPtr, 
+typedef int (__cdecl* LPFUNC7)(SoundConverter sc,
+			       const void    *inputPtr,
 			       unsigned long inputFrames,
 			       void          *outputPtr,
 			       unsigned long *outputFrames,
@@ -131,7 +131,7 @@
 			       void      *outputPtr,
 			       unsigned long *outputFrames,
 			       unsigned long *outputBytes);
-typedef int (__cdecl* LPFUNC9)(SoundConverter sc) ;        
+typedef int (__cdecl* LPFUNC9)(SoundConverter sc) ;
 
 
 typedef struct {
@@ -146,7 +146,7 @@
 
   xine_stream_t      *stream;
 
-  HINSTANCE           qtml_dll; 
+  HINSTANCE           qtml_dll;
 
   xine_waveformatex   wave;
   uint8_t             out_buf[1000000];
@@ -173,7 +173,7 @@
   uint8_t             data[BUFSIZE];
   int                 data_len;
   int                 num_frames;
-  
+
   ldt_fs_t *ldt_fs;
 } qta_decoder_t;
 
@@ -227,9 +227,9 @@
   lprintf ("audio: init_driver... (mutex locked)\n");
 
   this->ldt_fs = Setup_LDT_Keeper();
-  
+
   this->qtml_dll = LoadLibraryA("qtmlClient.dll");
-  
+
   if (this->qtml_dll == NULL ) {
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "qt_audio: failed to load dll\n" );
     pthread_mutex_unlock(&win32_codec_mutex);
@@ -240,63 +240,63 @@
 
   this->InitializeQTML = (LPFUNC1)GetProcAddress (this->qtml_dll, "InitializeQTML");
   if ( this->InitializeQTML == NULL )  {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "qt_audio: failed geting proc address InitializeQTML\n");
     pthread_mutex_unlock(&win32_codec_mutex);
     return;
   }
   this->SoundConverterOpen = (LPFUNC2)GetProcAddress (this->qtml_dll, "SoundConverterOpen");
   if ( this->SoundConverterOpen == NULL ) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "qt_audio: failed getting proc address SoundConverterOpen\n");
     pthread_mutex_unlock(&win32_codec_mutex);
     return;
   }
   this->SoundConverterClose = (LPFUNC3)GetProcAddress (this->qtml_dll, "SoundConverterClose");
   if ( this->SoundConverterClose == NULL ) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "qt_audio: failed getting proc address SoundConverterClose\n");
     pthread_mutex_unlock(&win32_codec_mutex);
     return;
   }
   this->TerminateQTML = (LPFUNC4)GetProcAddress (this->qtml_dll, "TerminateQTML");
   if ( this->TerminateQTML == NULL ) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "qt_audio: failed getting proc address TerminateQTML\n");
     pthread_mutex_unlock(&win32_codec_mutex);
     return;
   }
   this->SoundConverterSetInfo = (LPFUNC5)GetProcAddress (this->qtml_dll, "SoundConverterSetInfo");
   if ( this->SoundConverterSetInfo == NULL ) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "qt_audio: failed getting proc address SoundConverterSetInfo\n");
[... 274 lines omitted ...]
-      
+
   this->decpar.transferMode     = srcCopy;
   this->decpar.dstPixMap        = **this->GetGWorldPixMap (this->OutBufferGWorld);/*destPixmap;  */
-      
+
   cres = this->ImageCodecPreDecompress (this->ci, &this->decpar);
 
   lprintf ("video: ImageCodecPreDecompress cres=0x%X\n", cres);
-      
+
   this->data_len = 0;
 
   this->codec_initialized = 1;
@@ -930,7 +930,7 @@
 static void qtv_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
   qtv_decoder_t *this = (qtv_decoder_t *) this_gen;
 
-  lprintf ("video: decode_data, flags=0x%08x, len=%d, pts=%lld ...\n", 
+  lprintf ("video: decode_data, flags=0x%08x, len=%d, pts=%lld ...\n",
 	   buf->decoder_flags, buf->size, buf->pts);
 
   if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
@@ -944,7 +944,7 @@
 
   } else if (buf->decoder_flags & BUF_FLAG_SPECIAL) {
     lprintf ("video: special buffer\n");
-    
+
     if (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM) {
       lprintf ("video: got stsd atom -> init codec\n");
 
@@ -962,12 +962,12 @@
     this->data_len += buf->size;
 
     lprintf ("video: got %d bytes in buffer\n", this->data_len);
-    
+
     if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
 
       ComponentResult  cres;
       vo_frame_t      *img;
-    
+
       Check_FS_Segment(this->ldt_fs);
 
       pthread_mutex_lock(&win32_codec_mutex);
@@ -977,30 +977,30 @@
       (**this->framedescHandle).dataSize=this->data_len;
 
       cres = this->ImageCodecBandDecompress (this->ci, &this->decpar);
-    
+
       ++this->decpar.frameNumber;
 
       pthread_mutex_unlock(&win32_codec_mutex);
 
       if (cres&0xFFFF){
-	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 		"qt_video: ImageCodecBandDecompress cres=0x%lX (-0x%lX) %ld :(\n", cres,-cres,cres);
       }
 
       img = this->stream->video_out->get_frame (this->stream->video_out,
 						this->bih.biWidth,
 						this->bih.biHeight,
-						this->ratio, 
+						this->ratio,
 						XINE_IMGFMT_YUY2,
 						VO_BOTH_FIELDS);
-	
+
       img->pts       = buf->pts;
       img->duration  = buf->decoder_info[0];
       img->bad_frame = 0;
-	
-      xine_fast_memcpy (img->base[0], this->plane, 
+
+      xine_fast_memcpy (img->base[0], this->plane,
 			this->bih.biWidth*this->bih.biHeight*2);
-	
+
       img->draw(img, this->stream);
       img->free(img);
 
@@ -1019,7 +1019,7 @@
 
 static void qtv_reset (video_decoder_t *this_gen) {
   qtv_decoder_t *this = (qtv_decoder_t *) this_gen;
-  
+
   this->data_len = 0;
 }
 
@@ -1044,7 +1044,7 @@
   free (this);
 }
 
-static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen, 
+static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen,
 					 xine_stream_t *stream) {
 
   qtv_class_t   *cls = (qtv_class_t *) class_gen;
@@ -1069,13 +1069,13 @@
  */
 
 /*
- * some fake functions to make qt codecs happy 
+ * some fake functions to make qt codecs happy
  */
 
 #if 0
 static void codec_path_cb (void *data, xine_cfg_entry_t *cfg) {
   qtv_class_t *this = (qt_class_t *) data;
-  
+
   this->qt_codec_path = cfg->str_value;
 }
 #endif
@@ -1113,7 +1113,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class },
   { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }

diff --git a/src/libw32dll/qtx/qtxsdk/components.h b/src/libw32dll/qtx/qtxsdk/components.h
--- a/src/libw32dll/qtx/qtxsdk/components.h
+++ b/src/libw32dll/qtx/qtxsdk/components.h
@@ -721,13 +721,13 @@
     printf("sequenceID=%ld\n",cd->sequenceID);
     idh=cd->imageDescription;
     if(idh && idh[0]) dump_ImageDescription(idh[0]);
-    
+
     for(i=0;i<sizeof(CodecDecompressParams);i++){
 	printf(" %02X",((unsigned char*)cd)[i]);
 	if((i%16)==15) printf("\n");
     }
     printf("\n");
-    
+
     printf("data=%p  size=%ld\n",cd->data,cd->bufferSize);
     printf("frameno=%ld  lines: %ld .. %ld   condflags=0x%lX  callerflags=0x%X\n",
 	cd->frameNumber, cd->startLine, cd->stopLine, cd->conditionFlags,cd->callerFlags);
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -25,7 +25,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-                   
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <inttypes.h>
@@ -37,8 +37,8 @@
 #include "wine/vfw.h"
 #include "wine/mmreg.h"
 #include "wine/ldt_keeper.h"
-#include "wine/win32.h" 
-#include "wine/wineacm.h" 
+#include "wine/win32.h"
+#include "wine/wineacm.h"
 #include "wine/loader.h"
 
 #define NOAVIFILE_HEADERS
@@ -67,13 +67,13 @@
      0x73f7a062, 0x8829, 0x11d1,
      { 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d }
 };
-    
+
 static GUID CLSID_Acelp =
 {
      0x4009f700, 0xaeba, 0x11d1,
      { 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7 }
 };
-  
+
 static GUID wmv1_clsid =
 {
 	0x4facbba1, 0xffd8, 0x4cd7,
@@ -146,11 +146,11 @@
   video_decoder_t   video_decoder;
 
   xine_stream_t    *stream;
-  
+
   int64_t           video_step;
   int               decoder_ok;
 
-  BITMAPINFOHEADER  *bih, o_bih; 
+  BITMAPINFOHEADER  *bih, o_bih;
   double            ratio;
   char              scratch1[16]; /* some codecs overflow o_bih */
   HIC               hic;
@@ -162,7 +162,7 @@
   void             *img_buffer;
   int               size;
   long		    outfmt;
-  
+
   int               ex_functions;
   int               driver_type;
   GUID             *guid;
@@ -170,8 +170,8 @@
   DMO_VideoDecoder *dmo_dec;
 
   int               stream_id;
-  int               skipframes;  
-  
+  int               skipframes;
+
   ldt_fs_t *ldt_fs;
 } w32v_decoder_t;
 
@@ -181,7 +181,7 @@
 
 typedef struct w32a_decoder_s {
   audio_decoder_t   audio_decoder;
-  
+
   xine_stream_t    *stream;
 
   int               output_open;
@@ -190,25 +190,25 @@
   unsigned char    *buf;
   int               size;
   int64_t           pts;
-  
+
   /* these are used for pts estimation */
   int64_t           lastpts, sumpts, sumsize;
   double            byterate;
 
   unsigned char    *outbuf;
   int               outsize;
-      
+
   HACMSTREAM        srcstream;
   int               rec_audio_src_size;
   int               max_audio_src_size;
   int               num_channels;
   int               rate;
-  
+
   int               driver_type;
[... 1030 lines omitted ...]
       pthread_mutex_unlock(&win32_codec_mutex);
     }
- 
+
   } else if (this->decoder_ok) {
     lprintf ("decoding %d data bytes...\n", buf->size);
 
@@ -1498,9 +1498,9 @@
       return;
 
     Check_FS_Segment(this->ldt_fs);
-    
+
     w32a_decode_audio (this, buf->content, buf->size,
-		       buf->decoder_flags & BUF_FLAG_FRAME_END, 
+		       buf->decoder_flags & BUF_FLAG_FRAME_END,
 		       buf->pts);
   }
 }
@@ -1509,7 +1509,7 @@
 static void w32a_dispose (audio_decoder_t *this_gen) {
 
   w32a_decoder_t *this = (w32a_decoder_t *) this_gen;
-  
+
   pthread_mutex_lock(&win32_codec_mutex);
   if( this->driver_type == DRIVER_STD ) {
       if( this->srcstream ) {
@@ -1533,12 +1533,12 @@
     free(this->buf);
     this->buf = NULL;
   }
-  
+
   if( this->outbuf ) {
     free(this->outbuf);
     this->outbuf = NULL;
   }
-  
+
   this->decoder_ok = 0;
 
   if (this->output_open) {
@@ -1549,7 +1549,7 @@
   free (this);
 }
 
-static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_gen, 
+static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_gen,
 						   xine_stream_t *stream) {
 
   w32v_decoder_t *this ;
@@ -1593,7 +1593,7 @@
   this->decoder_class.dispose         = default_video_decoder_class_dispose;
 
   pthread_once (&once_control, init_routine);
-  
+
   return this;
 }
 
@@ -1601,7 +1601,7 @@
  * audio part
  */
 
-static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_gen, 
+static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_gen,
 						   xine_stream_t *stream) {
 
   w32a_decoder_t *this ;
@@ -1612,11 +1612,11 @@
   this->audio_decoder.reset               = w32a_reset;
   this->audio_decoder.discontinuity       = w32a_discontinuity;
   this->audio_decoder.dispose             = w32a_dispose;
-  
+
   this->stream      = stream;
   this->output_open = 0;
   this->decoder_ok  = 0;
-  
+
   this->buf         = NULL;
   this->outbuf      = NULL;
 
@@ -1630,7 +1630,7 @@
 
   w32a_class_t    *this;
   config_values_t *cfg;
-  
+
   cfg = xine->config;
   if ((win32_def_path = get_win32_codecs_path(cfg)) == NULL) return NULL;
 
@@ -1651,12 +1651,12 @@
  * exported plugin catalog entry
  */
 
-static const uint32_t video_types[] = { 
+static const uint32_t video_types[] = {
   BUF_VIDEO_MSMPEG4_V1, BUF_VIDEO_MSMPEG4_V2, BUF_VIDEO_MSMPEG4_V3,
   BUF_VIDEO_IV50, BUF_VIDEO_IV41, BUF_VIDEO_IV32, BUF_VIDEO_IV31,
   BUF_VIDEO_CINEPAK, /* BUF_VIDEO_ATIVCR1, */
   BUF_VIDEO_ATIVCR2, BUF_VIDEO_I263, BUF_VIDEO_MSVC,
-  BUF_VIDEO_DV, BUF_VIDEO_WMV7, BUF_VIDEO_WMV8, BUF_VIDEO_WMV9, 
+  BUF_VIDEO_DV, BUF_VIDEO_WMV7, BUF_VIDEO_WMV8, BUF_VIDEO_WMV9,
   BUF_VIDEO_VP31, BUF_VIDEO_MSS1, BUF_VIDEO_TSCC, BUF_VIDEO_UCOD,
   BUF_VIDEO_VP4, BUF_VIDEO_VP5, BUF_VIDEO_VP6,
   0
@@ -1667,8 +1667,8 @@
   1                    /* priority        */
 };
 
-static const uint32_t audio_types[] = { 
-  BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_WMAV3, BUF_AUDIO_MSADPCM, 
+static const uint32_t audio_types[] = {
+  BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_WMAV3, BUF_AUDIO_MSADPCM,
   BUF_AUDIO_MSIMAADPCM, BUF_AUDIO_MSGSM, BUF_AUDIO_IMC, BUF_AUDIO_LH,
   BUF_AUDIO_VOXWARE, BUF_AUDIO_ACELPNET, BUF_AUDIO_VIVOG723, BUF_AUDIO_WMAV,
   BUF_AUDIO_WMALL,
@@ -1681,7 +1681,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class },
   { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }

diff --git a/src/libw32dll/w32codec.h b/src/libw32dll/w32codec.h
--- a/src/libw32dll/w32codec.h
+++ b/src/libw32dll/w32codec.h
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2001 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c
--- a/src/post/audio/audio_filters.c
+++ b/src/post/audio/audio_filters.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -38,7 +38,7 @@
 
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_POST, 10, "upmix",      XINE_VERSION_CODE, &upmix_special_info,      &upmix_init_plugin },
   { PLUGIN_POST, 10, "upmix_mono", XINE_VERSION_CODE, &upmix_mono_special_info, &upmix_mono_init_plugin },
   { PLUGIN_POST, 10, "stretch",    XINE_VERSION_CODE, &stretch_special_info,    &stretch_init_plugin },
diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h
--- a/src/post/audio/audio_filters.h
+++ b/src/post/audio/audio_filters.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
diff --git a/src/post/audio/dsp.h b/src/post/audio/dsp.h
--- a/src/post/audio/dsp.h
+++ b/src/post/audio/dsp.h
@@ -1,5 +1,5 @@
 /*=============================================================================
- *	
+ *
  *  This software has been released under the terms of the GNU Public
  *  license. See http://www.gnu.org/copyleft/gpl.html for details.
  *
@@ -9,7 +9,7 @@
  */
 
 #ifndef	_DSP_H
-#define	_DSP_H 	1
+#define	_DSP_H	1
 
 /* Implementation of routines used for DSP */
 
diff --git a/src/post/audio/filter.c b/src/post/audio/filter.c
--- a/src/post/audio/filter.c
+++ b/src/post/audio/filter.c
@@ -1,5 +1,5 @@
 /*=============================================================================
- *	
+ *
  *  This software has been released under the terms of the GNU Public
  *  license. See http://www.gnu.org/copyleft/gpl.html for details.
  *
@@ -25,12 +25,12 @@
  *
  * n number of filter taps, where mod(n,4)==0
  * w filter taps
- * x input signal must be a circular buffer which is indexed backwards 
+ * x input signal must be a circular buffer which is indexed backwards
  */
 inline _ftype_t fir(register unsigned int n, _ftype_t* w, _ftype_t* x)
 {
   register _ftype_t y; /* Output */
-  y = 0.0; 
+  y = 0.0;
   do{
     n--;
     y+=w[n]*x[n];
@@ -44,7 +44,7 @@
  * d  number of filters
  * xi current index in xq
  * w  filter taps k by n big
- * x  input signal must be a circular buffers which are indexed backwards 
+ * x  input signal must be a circular buffers which are indexed backwards
  * y  output buffer
  * s  output buffer stride
  */
@@ -67,11 +67,11 @@
    at the new samples, xi current index in xq and n the length of the
    filter. xq must be n*2 by k big, s is the index for in.
 */
-inline int updatepq(unsigned int n, unsigned int d, unsigned int xi, _ftype_t** xq, _ftype_t* in, unsigned int s)  
+inline int updatepq(unsigned int n, unsigned int d, unsigned int xi, _ftype_t** xq, _ftype_t* in, unsigned int s)
 {
   register _ftype_t* txq = *xq + xi;
   register int nt = n*2;
-  
+
   while(d-- >0){
     *txq= *(txq+n) = *in;
     txq+=nt;
@@ -88,26 +88,26 @@
 
    n     filter length must be odd for HP and BS filters
    w     buffer for the filter taps (must be n long)
-   fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS) 
+   fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS)
          0 < fc < 1 where 1 <=> Fs/2
    flags window and filter type as defined in filter.h
-         variables are ored together: i.e. LP|HAMMING will give a 
-	 low pass filter designed using a hamming window  
+         variables are ored together: i.e. LP|HAMMING will give a
+	 low pass filter designed using a hamming window
    opt   beta constant used only when designing using kaiser windows
-   
+
    returns 0 if OK, -1 if fail
 */
 int design_fir(unsigned int n, _ftype_t* w, _ftype_t* fc, unsigned int flags, _ftype_t opt)
 {
-  unsigned int	o   = n & 1;          	/* Indicator for odd filter length */
+  unsigned int	o   = n & 1;	/* Indicator for odd filter length */
   unsigned int	end = ((n + 1) >> 1) - o;  /* Loop end */
   unsigned int	i;			/* Loop index */
 
   _ftype_t k1 = 2 * M_PI;		/* 2*pi*fc1 */
   _ftype_t k2 = 0.5 * (_ftype_t)(1 - o);/* Constant used if the filter has even length */
   _ftype_t k3;				/* 2*pi*fc2 Constant used in BP and BS design */
-  _ftype_t g  = 0.0;     		/* Gain */
-  _ftype_t t1,t2,t3;     		/* Temporary variables */
+  _ftype_t g  = 0.0;		/* Gain */
+  _ftype_t t1,t2,t3;		/* Temporary variables */
   _ftype_t fc1,fc2;			/* Cutoff frequencies */
 
   /* Sanity check */
@@ -130,10 +130,10 @@
   case(KAISER):
     kaiser(n,w,opt); break;
   default:
-    return -1;	
+    return -1;
   }
 
-  if(flags & (LP | HP)){ 
+  if(flags & (LP | HP)){
     fc1=*fc;
     /* Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2 */
     fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1/2 : 0.25;
@@ -143,7 +143,7 @@
 
       /*
        * If the filter length is odd, there is one point which is exactly
-       * in the middle. The value at this point is 2*fCutoff*sin(x)/x, 
+       * in the middle. The value at this point is 2*fCutoff*sin(x)/x,
        * where x is zero. To make sure nothing strange happens, we set this
        * value separately.
        */
@@ -196,9 +196,9 @@
 	t2 = sin(k3 * t1)/(M_PI * t1); /* Sinc fc2 */
 	t3 = sin(k1 * t1)/(M_PI * t1); /* Sinc fc1 */
 	g += w[end-i-1] * (t3 + t2);   /* Total gain in filter */
-	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3); 
+	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3);
       }
-    }      
+    }
     else{ /* Band stop */
       if (!o) /* Band stop filters must have odd length */
 	return -1;
@@ -210,7 +210,7 @@
 	t1 = (_ftype_t)(i+1);
 	t2 = sin(k1 * t1)/(M_PI * t1); /* Sinc fc1 */
 	t3 = sin(k3 * t1)/(M_PI * t1); /* Sinc fc2 */
-	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3); 
+	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3);
 	g += 2*w[end-i-1]; /* Total gain in filter */
       }
     }
@@ -218,9 +218,9 @@
 
   /* Normalize gain */
   g=1/g;
-  for (i=0; i<n; i++) 
+  for (i=0; i<n; i++)
     w[i] *= g;
-  
+
   return 0;
 }
 
@@ -229,7 +229,7 @@
  * n     length of prototype filter
  * k     number of polyphase components
  * w     prototype filter taps
- * pw    Parallel FIR filter 
+ * pw    Parallel FIR filter
  * g     Filter gain
  * flags FWD forward indexing
  *       REW reverse indexing
@@ -240,10 +240,10 @@
 int design_pfir(unsigned int n, unsigned int k, _ftype_t* w, _ftype_t** pw, _ftype_t g, unsigned int flags)
 {
   int l = (int)n/k;	/* Length of individual FIR filters */
-  int i;     	/* Counters */
+  int i;	/* Counters */
   int j;
   _ftype_t t;	/* g * w[i] */
-  
+
   /* Sanity check */
   if(l<1 || k<1 || !w || !pw)
     return -1;
@@ -276,7 +276,7 @@
 
 /* Pre-warp the coefficients of a numerator or denominator.
  * Note that a0 is assumed to be 1, so there is no wrapping
- * of it.  
+ * of it.
  */
 void prewarp(_ftype_t* a, _ftype_t fc, _ftype_t fs)
 {
@@ -303,12 +303,12 @@
  *  Arguments:
  * a       - s-domain numerator coefficients
  * b       - s-domain denominator coefficients
- * k 	   - filter gain factor. Initially set to 1 and modified by each
+ * k	   - filter gain factor. Initially set to 1 and modified by each
  *           biquad section in such a way, as to make it the
  *           coefficient by which to multiply the overall filter gain
  *           in order to achieve a desired overall filter gain,
- *           specified in initial value of k.  
- * fs 	   - sampling rate (Hz)
+ *           specified in initial value of k.
+ * fs	   - sampling rate (Hz)
  * coef    - array of z-domain coefficients to be filled in.
  *
  * Return: On return, set coef z-domain coefficients and k to the gain
@@ -342,7 +342,7 @@
  * create a filter fill in a, b, Q and fs and make space for coef and k.
  *
  *
- * Example Butterworth design: 
+ * Example Butterworth design:
  *
  * Below are Butterworth polynomials, arranged as a series of 2nd
  * order sections:
@@ -398,12 +398,12 @@
  * a       - s-domain numerator coefficients, a[1] is always assumed to be 1.0
  * b       - s-domain denominator coefficients
  * Q	   - Q value for the filter
- * k 	   - filter gain factor. Initially set to 1 and modified by each
+ * k	   - filter gain factor. Initially set to 1 and modified by each
  *           biquad section in such a way, as to make it the
  *           coefficient by which to multiply the overall filter gain
  *           in order to achieve a desired overall filter gain,
- *           specified in initial value of k.  
- * fs 	   - sampling rate (Hz)
+ *           specified in initial value of k.
+ * fs	   - sampling rate (Hz)
  * coef    - array of z-domain coefficients to be filled in.
  *
  * Note: Upon return from each call, the k argument will be set to a
@@ -419,7 +419,7 @@
   _ftype_t at[3];
   _ftype_t bt[3];
 
-  if(!a || !b || !k || !coef || (Q>1000.0 || Q< 1.0)) 
+  if(!a || !b || !k || !coef || (Q>1000.0 || Q< 1.0))
     return -1;
 
   memcpy(at,a,3*sizeof(_ftype_t));
diff --git a/src/post/audio/filter.h b/src/post/audio/filter.h
--- a/src/post/audio/filter.h
+++ b/src/post/audio/filter.h
@@ -1,5 +1,5 @@
 /*=============================================================================
- *	
+ *
  *  This software has been released under the terms of the GNU Public
  *  license. See http://www.gnu.org/copyleft/gpl.html for details.
  *
@@ -37,7 +37,7 @@
 #define WINDOW_MASK 0x0000001F
 
 /* Parallel filter design */
-#define	FWD   	    0x00000001 /* Forward indexing of polyphase filter */
+#define	FWD	    0x00000001 /* Forward indexing of polyphase filter */
 #define REW         0x00000002 /* Reverse indexing of polyphase filter */
 #define ODD         0x00000010 /* Make filter HP */
 
@@ -60,7 +60,7 @@
 /* Add new data to circular queue designed to be used with a FIR
  * filter. xq is the circular queue, in pointing at the new sample, xi
  * current index for xq and n the length of the filter. xq must be n*2
- * long. 
+ * long.
  */
 #define updateq(n,xi,xq,in)\
   xq[xi]=(xq)[(xi)+(n)]=*(in);\
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -70,19 +70,19 @@
 
   struct   timeval tv;
   int64_t  pts;
-  double   pts_calc; 
+  double   pts_calc;
 
   xine_monotonic_clock(&tv, NULL);
   pts_calc = (tv.tv_sec  - this->cur_time.tv_sec) * this->speed_factor;
   pts_calc += (tv.tv_usec - this->cur_time.tv_usec) * this->speed_factor / 1e6;
   pts = this->cur_pts + pts_calc;
 
-/* This next part introduces a one off inaccuracy 
- * to the scr due to rounding tv to pts. 
+/* This next part introduces a one off inaccuracy
+ * to the scr due to rounding tv to pts.
  */
   this->cur_time.tv_sec=tv.tv_sec;
   this->cur_time.tv_usec=tv.tv_usec;
-  this->cur_pts=pts; 
+  this->cur_pts=pts;
 
   return ;
 }
@@ -94,7 +94,7 @@
 
   stretchscr_set_pivot( this );
   this->xine_speed   = speed;
-  this->speed_factor = (double) speed * 90000.0 / XINE_FINE_SPEED_NORMAL / 
+  this->speed_factor = (double) speed * 90000.0 / XINE_FINE_SPEED_NORMAL /
                        (*this->stretch_factor);
 
   pthread_mutex_unlock (&this->lock);
@@ -125,7 +125,7 @@
   this->cur_pts = start_vpts;
 
   pthread_mutex_unlock (&this->lock);
-  
+
   stretchscr_set_speed (&this->scr, XINE_FINE_SPEED_NORMAL);
 }
 
@@ -134,16 +134,16 @@
 
   struct   timeval tv;
   int64_t pts;
-  double   pts_calc; 
+  double   pts_calc;
   pthread_mutex_lock (&this->lock);
 
   xine_monotonic_clock(&tv, NULL);
-  
+
   pts_calc = (tv.tv_sec  - this->cur_time.tv_sec) * this->speed_factor;
   pts_calc += (tv.tv_usec - this->cur_time.tv_usec) * this->speed_factor / 1e6;
 
   pts = this->cur_pts + pts_calc;
-  
+
   pthread_mutex_unlock (&this->lock);
 
   return pts;
@@ -168,9 +168,9 @@
   this->scr.start             = stretchscr_start;
   this->scr.get_current       = stretchscr_get_current;
   this->scr.exit              = stretchscr_exit;
-  
+
   pthread_mutex_init (&this->lock, NULL);
-  
+
   this->stretch_factor = stretch_factor;
   stretchscr_set_speed (&this->scr, XINE_SPEED_PAUSE);
 
@@ -202,21 +202,21 @@
 START_PARAM_DESCR( stretch_parameters_t )
 PARAM_ITEM( POST_PARAM_TYPE_BOOL, preserve_pitch, NULL, 0, 1, 0,
             "Preserve pitch" )
-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, factor, NULL, 0.5, 1.5, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, factor, NULL, 0.5, 1.5, 0,
             "Time stretch factor (<1.0 shorten duration)" )
 END_PARAM_DESCR( param_descr )
 
 /* plugin structure */
 struct post_plugin_stretch_s {
   post_plugin_t        post;
-  
+
   stretchscr_t*        scr;
 
   /* private data */
   stretch_parameters_t params;
   xine_post_in_t       params_input;
   int                  params_changed;
-  
+
   int                  channels;
   int                  bytes_per_frame;
 
@@ -228,9 +228,9 @@
   int                  num_frames;        /* current # of frames on audiofrag */
 
[... 286 lines omitted ...]
 
     if( this->frames_per_frag != this->frames_per_outfrag ) {
       int wsize;
-      
-      this->audiofrag = malloc( this->frames_per_frag * this->bytes_per_frame ); 
-      this->outfrag = malloc( this->frames_per_outfrag * this->bytes_per_frame ); 
-  
+
+      this->audiofrag = malloc( this->frames_per_frag * this->bytes_per_frame );
+      this->outfrag = malloc( this->frames_per_outfrag * this->bytes_per_frame );
+
       if( this->frames_per_frag > this->frames_per_outfrag )
         wsize = this->frames_per_frag - this->frames_per_outfrag;
       else
@@ -559,41 +559,41 @@
       this->w = (_ftype_t*) malloc( wsize * sizeof(_ftype_t) );
       triang(wsize, this->w);
     }
-                
+
     this->num_frames = 0;
     this->pts = 0;
-    
+
     this->params_changed = 0;
   }
-  
+
   pthread_mutex_unlock (&this->lock);
 
   /* just pass data through if we have nothing to do */
   if( this->frames_per_frag == this->frames_per_outfrag ||
       /* FIXME: we only handle 1 or 2 channels, 16 bits for now */
-      (this->channels != 1 && this->channels != 2) || 
+      (this->channels != 1 && this->channels != 2) ||
       port->bits != 16 ) {
-  
-    port->original_port->put_buffer(port->original_port, buf, stream );  
-  
+
+    port->original_port->put_buffer(port->original_port, buf, stream );
+
     return;
   }
-  
+
   /* update pts for our current audio fragment */
   if( buf->vpts )
     this->pts = buf->vpts - (this->num_frames * 90000 / port->rate);
-  
+
   data_in = buf->mem;
   while( buf->num_frames ) {
     int frames_to_copy = this->frames_per_frag - this->num_frames;
-    
+
     if( frames_to_copy > buf->num_frames )
       frames_to_copy = buf->num_frames;
 
     /* copy up to one fragment from input buf to our buffer */
     memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame,
             data_in, frames_to_copy * this->bytes_per_frame );
-    
+
     data_in = (uint16_t *)((uint8_t *)data_in + frames_to_copy * this->bytes_per_frame);
     this->num_frames += frames_to_copy;
     buf->num_frames -= frames_to_copy;
@@ -603,10 +603,10 @@
       stretch_process_fragment( port, stream, buf->extra_info );
     }
   }
-  
+
   buf->num_frames=0; /* UNDOCUMENTED, but hey, it works! Force old audio_out buffer free. */
-  port->original_port->put_buffer(port->original_port, buf, stream );  
-  
+  port->original_port->put_buffer(port->original_port, buf, stream );
+
   return;
 }
 
@@ -630,21 +630,21 @@
   xine_post_in_t       *input_api;
   post_audio_port_t    *port;
   stretch_parameters_t  init_params;
-  
+
   if (!this || !audio_target || !audio_target[0] ) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 1, 0);
 
   init_params.preserve_pitch = 1;
   init_params.factor = 0.80;
-  
+
   pthread_mutex_init (&this->lock, NULL);
 
   set_parameters ((xine_post_t *)&this->post, &init_params);
-  
+
   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
   port->new_port.open       = stretch_port_open;
   port->new_port.close      = stretch_port_close;
@@ -667,16 +667,16 @@
 void *stretch_init_plugin(xine_t *xine, void *data)
 {
   post_class_stretch_t *class = (post_class_stretch_t *)xine_xmalloc(sizeof(post_class_stretch_t));
-  
+
   if (!class)
     return NULL;
-  
+
   class->post_class.open_plugin     = stretch_open_plugin;
   class->post_class.identifier      = "stretch";
   class->post_class.description     = N_("Time stretch by a given factor, optionally preserving pitch");
   class->post_class.dispose         = default_post_class_dispose;
-  
+
   class->xine                       = xine;
-  
+
   return class;
 }

diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -167,13 +167,13 @@
 
   _x_post_rewire(&this->post);
   _x_post_inc_usage(port);
-  
+
   port->stream = stream;
   port->bits = bits;
   port->rate = rate;
   port->mode = mode;
   capabilities = port->original_port->get_capabilities(port->original_port);
-  
+
   this->channels = _x_ao_mode2channels(mode);
   /* FIXME: Handle all desired output formats */
   if ((capabilities & AO_CAP_MODE_5_1CHANNEL) && (capabilities & AO_CAP_FLOAT32)) {
@@ -232,7 +232,7 @@
   float right;
   float sum;
   int frame;
-  int src_units_per_sample=1; 
+  int src_units_per_sample=1;
   if (step_channel_in == 3) src_units_per_sample=step_channel_in; /* Special handling for 24 bit 3byte input */
 
   for (frame=0;frame < num_frames; frame++) {
@@ -297,9 +297,9 @@
   return frame;
 }
 
-static void upmix_port_put_buffer (xine_audio_port_t *port_gen, 
+static void upmix_port_put_buffer (xine_audio_port_t *port_gen,
                              audio_buffer_t *buf, xine_stream_t *stream) {
-  
+
   post_audio_port_t  *port = (post_audio_port_t *)port_gen;
   post_plugin_upmix_t *this = (post_plugin_upmix_t *)port->post;
   int src_step_frame;
@@ -315,7 +315,7 @@
 
   if ((this->channels==2) && (this->channels_out==6)) {
     while (num_frames_processed < buf->num_frames) {
-      this->buf = port->original_port->get_buffer(port->original_port); 
+      this->buf = port->original_port->get_buffer(port->original_port);
       /* this->buf->num_frames is handled after the upmix */
       this->buf->vpts = buf->vpts;
       if (num_frames_processed != 0) this->buf->vpts = 0;
@@ -327,7 +327,7 @@
       this->buf->format.bits = 32; /* Upmix to floats */
       this->buf->format.rate = port->rate;
       this->buf->format.mode = AO_CAP_MODE_5_1CHANNEL;
-      _x_extra_info_merge( this->buf->extra_info, buf->extra_info); 
+      _x_extra_info_merge( this->buf->extra_info, buf->extra_info);
       step_channel_in = port->bits>>3;
       step_channel_out = this->buf->format.bits>>3;
       dst_step_frame = this->channels_out*step_channel_out;
@@ -353,18 +353,18 @@
         }
       }
       pthread_mutex_unlock (&this->lock);
-  
+
       num_frames_done = upmix_frames_2to51_any_to_float(data8dst, data8src, num_frames, step_channel_in, this->sub);
       this->buf->num_frames = num_frames_done;
       num_frames_processed+= num_frames_done;
       /* pass data to original port */
-      port->original_port->put_buffer(port->original_port, this->buf, stream );  
+      port->original_port->put_buffer(port->original_port, this->buf, stream );
     }
     /* free data from origial buffer */
     buf->num_frames=0; /* UNDOCUMENTED, but hey, it works! Force old audio_out buffer free. */
   }
-  port->original_port->put_buffer(port->original_port, buf, stream );  
-  
+  port->original_port->put_buffer(port->original_port, buf, stream );
+
   return;
 }
 
@@ -388,16 +388,16 @@
   post_out_t           *output;
   xine_post_in_t       *input_api;
   post_audio_port_t    *port;
-  
+
   if (!this || !audio_target || !audio_target[0] ) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 1, 0);
 
   this->params.cut_off_freq = 100;
-  
+
   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
   port->new_port.open       = upmix_port_open;
 #if 0
@@ -422,16 +422,16 @@
 void *upmix_init_plugin(xine_t *xine, void *data)
 {
   post_class_upmix_t *class = (post_class_upmix_t *)xine_xmalloc(sizeof(post_class_upmix_t));
-  
+
   if (!class)
     return NULL;
-  
+
   class->post_class.open_plugin     = upmix_open_plugin;
   class->post_class.identifier      = "upmix";
   class->post_class.description     = N_("upmix");
   class->post_class.dispose         = default_post_class_dispose;
-  
+
   class->xine                       = xine;
-  
+
   return class;
 }
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -68,11 +68,11 @@
 
   /* private data */
   int            channels;
-  
+
   upmix_mono_parameters_t params;
   xine_post_in_t       params_input;
   int                  params_changed;
-  
+
   pthread_mutex_t      lock;
 
 };
@@ -134,7 +134,7 @@
 
   _x_post_rewire(&this->post);
   _x_post_inc_usage(port);
-  
+
   port->stream = stream;
   port->bits = bits;
   port->rate = rate;
@@ -142,7 +142,7 @@
 
   this->channels = _x_ao_mode2channels(mode);
   capabilities = port->original_port->get_capabilities(port->original_port);
-  
+
   if (this->channels == 1 && (capabilities & AO_CAP_MODE_STEREO)) {
     xprintf(stream->xine, XINE_VERBOSITY_LOG,
             _(LOG_MODULE ": upmixing Mono to Stereo.\n"));
@@ -151,7 +151,7 @@
     if ( this->channels != 1)
       xprintf(stream->xine, XINE_VERBOSITY_LOG,
               ngettext(LOG_MODULE ": upmixing a single channel from original %d channel stream.\n",
-                       LOG_MODULE ": upmixing a single channel from original %d channels stream.\n", 
+                       LOG_MODULE ": upmixing a single channel from original %d channels stream.\n",
                        this->channels), this->channels);
     else {
       xprintf(stream->xine, XINE_VERBOSITY_LOG,
@@ -163,15 +163,15 @@
   return (port->original_port->open) (port->original_port, stream, bits, rate, mode);
 }
 
-static void upmix_mono_port_put_buffer(xine_audio_port_t *port_gen, 
+static void upmix_mono_port_put_buffer(xine_audio_port_t *port_gen,
                              audio_buffer_t *buf, xine_stream_t *stream) {
-  
+
   post_audio_port_t        *port = (post_audio_port_t *)port_gen;
   post_plugin_upmix_mono_t *this = (post_plugin_upmix_mono_t *)port->post;
-  
+
   pthread_mutex_lock (&this->lock);
 
-  if (this->channels == 1) 
+  if (this->channels == 1)
   {
     audio_buffer_t *buf0 = port->original_port->get_buffer(port->original_port);
     audio_buffer_t *buf1 = port->original_port->get_buffer(port->original_port);
@@ -232,7 +232,7 @@
     /* free data from origial buffer */
     buf->num_frames = 0; /* UNDOCUMENTED, but hey, it works! Force old audio_out buffer free. */
   }
-  else if (this->channels && this->params.channel >= 0) 
+  else if (this->channels && this->params.channel >= 0)
   {
     audio_buffer_t *buf0 = port->original_port->get_buffer(port->original_port);
     buf0->num_frames = buf->num_frames;
@@ -253,12 +253,12 @@
       uint8_t *dst0 = (uint8_t *)buf0->mem;
       int cur_channel = this->params.channel;
       int i, j;
-      
+
       if( cur_channel >= this->channels )
         cur_channel = this->channels-1;
 
       src += cur_channel * step;
-      
+
       for (i = 0; i < buf->num_frames; i++)
       {
         for (j = 0; j < this->channels; j++ )
@@ -276,11 +276,11 @@
     /* free data from origial buffer */
     buf->num_frames = 0; /* UNDOCUMENTED, but hey, it works! Force old audio_out buffer free. */
   }
-  
+
   pthread_mutex_unlock (&this->lock);
-    
+
   port->original_port->put_buffer(port->original_port, buf, stream);
-  
+
   return;
 }
 
@@ -303,24 +303,24 @@
   xine_post_in_t       *input_api;
   post_audio_port_t        *port;
   upmix_mono_parameters_t  init_params;
-  
+
   if (!this || !audio_target || !audio_target[0]) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 1, 0);
 
   init_params.channel = -1;
- 
+
   pthread_mutex_init (&this->lock, NULL);
 
   set_parameters ((xine_post_t *)&this->post, &init_params);
-  
+
   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
   port->new_port.open       = upmix_mono_port_open;
   port->new_port.put_buffer = upmix_mono_port_put_buffer;
-  
+
   input_api       = &this->params_input;
   input_api->name = "parameters";
   input_api->type = XINE_POST_DATA_PARAMETERS;
@@ -337,17 +337,17 @@
 void *upmix_mono_init_plugin(xine_t *xine, void *data)
 {
   post_class_upmix_mono_t *class = (post_class_upmix_mono_t *)xine_xmalloc(sizeof(post_class_upmix_mono_t));
-  
+
   if (!class)
     return NULL;
-  
+
   class->post_class.open_plugin     = upmix_mono_open_plugin;
   class->post_class.identifier      = "upmix_mono";
   class->post_class.description     = N_("converts Mono into Stereo");
   class->post_class.dispose         = default_post_class_dispose;
-  
+
   class->xine                       = xine;
-  
+
   return class;
 }
 
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -1,24 +1,24 @@
 /*
  * Copyright (C) 2000-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * Volume normalization audio filter for xine.  Ported by Jason Tackaberry
- * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi 
+ * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi
  * & Pierre Lombard.
  */
 
@@ -117,7 +117,7 @@
 /**************************************************************************
  * volnorm parameters functions
  *************************************************************************/
-static int set_parameters (xine_post_t *this_gen, void *param_gen) 
+static int set_parameters (xine_post_t *this_gen, void *param_gen)
 {
     post_plugin_volnorm_t *this = (post_plugin_volnorm_t *)this_gen;
     volnorm_parameters_t *param = (volnorm_parameters_t *)param_gen;
@@ -129,7 +129,7 @@
     return 1;
 }
 
-static int get_parameters (xine_post_t *this_gen, void *param_gen) 
+static int get_parameters (xine_post_t *this_gen, void *param_gen)
 {
     post_plugin_volnorm_t *this = (post_plugin_volnorm_t *)this_gen;
     volnorm_parameters_t *param = (volnorm_parameters_t *)param_gen;
@@ -141,12 +141,12 @@
     return 1;
 }
 
-static xine_post_api_descr_t * get_param_descr (void) 
+static xine_post_api_descr_t * get_param_descr (void)
 {
     return &param_descr;
 }
 
-static char * get_help (void) 
+static char * get_help (void)
 {
     return _("Normalizes audio by maximizing the volume without distorting "
              "the sound.\n"
@@ -172,14 +172,14 @@
  *************************************************************************/
 
 static int volnorm_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
-                             uint32_t bits, uint32_t rate, int mode) 
+                             uint32_t bits, uint32_t rate, int mode)
 {
     post_audio_port_t  *port = (post_audio_port_t *)port_gen;
     post_plugin_volnorm_t *this = (post_plugin_volnorm_t *)port->post;
 
     _x_post_rewire(&this->post);
     _x_post_inc_usage(port);
-    
+
     port->stream = stream;
     port->bits = bits;
     port->rate = rate;
@@ -373,10 +373,10 @@
 }
 
 
-static void volnorm_port_put_buffer (xine_audio_port_t *port_gen, 
-                                     audio_buffer_t *buf, xine_stream_t *stream) 
+static void volnorm_port_put_buffer (xine_audio_port_t *port_gen,
+                                     audio_buffer_t *buf, xine_stream_t *stream)
 {
-    
+
     post_audio_port_t  *port = (post_audio_port_t *)port_gen;
     post_plugin_volnorm_t *this = (post_plugin_volnorm_t *)port->post;
 
@@ -391,8 +391,8 @@
         else if (buf->format.bits == 32)
             method2_float(this, buf);
     }
-    port->original_port->put_buffer(port->original_port, buf, stream );  
-    
+    port->original_port->put_buffer(port->original_port, buf, stream );
+
     return;
 }
 
@@ -416,12 +416,12 @@
     post_out_t            *output;
     xine_post_in_t        *input_api;
     post_audio_port_t     *port;
-    
+
     if (!this || !audio_target || !audio_target[0] ) {
         free(this);
         return NULL;
     }
-    
+
     _x_post_init(&this->post, 1, 0);
     pthread_mutex_init (&this->lock, NULL);
 
@@ -453,16 +453,16 @@
 void *volnorm_init_plugin(xine_t *xine, void *data)
 {
     post_class_volnorm_t *class = (post_class_volnorm_t *)xine_xmalloc(sizeof(post_class_volnorm_t));
-    
+
     if (!class)
         return NULL;
-    
+
     class->post_class.open_plugin     = volnorm_open_plugin;
     class->post_class.identifier      = "volnorm";
     class->post_class.description     = N_("Normalize volume");
     class->post_class.dispose         = default_post_class_dispose;
-    
+
     class->xine                       = xine;
-    
+
     return class;
 }
diff --git a/src/post/audio/window.c b/src/post/audio/window.c
--- a/src/post/audio/window.c
+++ b/src/post/audio/window.c
@@ -1,5 +1,5 @@
 /*=============================================================================
- *	
+ *
  *  This software has been released under the terms of the GNU Public
  *  license. See http://www.gnu.org/copyleft/gpl.html for details.
  *
@@ -39,7 +39,7 @@
 /*
  * Triang a.k.a Bartlett
  *
- *               |    (N-1)| 
+ *               |    (N-1)|
  *           2 * |k - -----|
  *               |      2  |
  * w = 1.0 - ---------------
@@ -53,7 +53,7 @@
   _ftype_t k2  = 1/((_ftype_t)n + k1);
   int      end = (n + 1) >> 1;
   int	   i;
-  
+
   /* Calculate window coefficients */
   for (i=0 ; i<end ; i++)
     w[i] = w[n-i-1] = (2.0*((_ftype_t)(i+1))-(1.0-k1))*k2;
@@ -72,7 +72,7 @@
 {
   int	   i;
   _ftype_t k = 2*M_PI/((_ftype_t)(n+1)); /* 2*pi/(N+1) */
-  
+
   /* Calculate window coefficients */
   for (i=0; i<n; i++)
     *w++ = 0.5*(1.0 - cos(k*(_ftype_t)(i+1)));
@@ -131,22 +131,22 @@
   int      i;
   _ftype_t k1 = 2*M_PI/((_ftype_t)(n-1)); /* 2*pi/(N-1) */
   _ftype_t k2 = 2*k1;                   /* 4*pi/(N-1) */
-  
+
   /* Calculate window coefficients */
   for (i=0; i<n; i++)
     *w++ = 0.2810638602 - 0.5208971735*cos(k1*(_ftype_t)i) + 0.1980389663*cos(k2*(_ftype_t)i);
 }
 
-/* Computes the 0th order modified Bessel function of the first kind.  
- * (Needed to compute Kaiser window) 
- *   
+/* Computes the 0th order modified Bessel function of the first kind.
+ * (Needed to compute Kaiser window)
+ *
  * y = sum( (x/(2*n))^2 )
  *      n
  */
 #define BIZ_EPSILON 1E-21 /* Max error acceptable */
 
 static _ftype_t besselizero(_ftype_t x)
-{ 
+{
   _ftype_t temp;
   _ftype_t sum   = 1.0;
   _ftype_t u     = 1.0;
@@ -175,10 +175,10 @@
  * Gold (Theory and Application of DSP) under Kaiser windows for more
  * about Beta.  The following table from Rabiner and Gold gives some
  * feel for the effect of Beta:
- * 
+ *
  * All ripples in dB, width of transition band = D*N where N = window
  * length
- * 
+ *
  * BETA    D       PB RIP   SB RIP
  * 2.120   1.50  +-0.27      -30
  * 3.384   2.23    0.0864    -40
@@ -195,8 +195,8 @@
   _ftype_t k1  = 1.0/besselizero(b);
   int	   k2  = 1 - (n & 1);
   int      end = (n + 1) >> 1;
-  int      i; 
-  
+  int      i;
+
   /* Calculate window coefficients */
   for (i=0 ; i<end ; i++){
     tmp = (_ftype_t)(2*i + k2) / ((_ftype_t)n - 1.0);
diff --git a/src/post/audio/window.h b/src/post/audio/window.h
--- a/src/post/audio/window.h
+++ b/src/post/audio/window.h
@@ -1,5 +1,5 @@
 /*=============================================================================
- *	
+ *
  *  This software has been released under the terms of the GNU Public
  *  license. See http://www.gnu.org/copyleft/gpl.html for details.
  *
diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am
--- a/src/post/deinterlace/Makefile.am
+++ b/src/post/deinterlace/Makefile.am
@@ -9,7 +9,7 @@
 xinepost_LTLIBRARIES = xineplug_post_tvtime.la
 
 xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
-	deinterlace.c pulldown.c speedy.c tvtime.c 
+	deinterlace.c pulldown.c speedy.c tvtime.c
 xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(PTHREAD_LIBS) \
 	$(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
 
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am
--- a/src/post/deinterlace/plugins/Makefile.am
+++ b/src/post/deinterlace/plugins/Makefile.am
@@ -37,9 +37,9 @@
 
 if DEBUG_BUILD
 debug_sources   = greedy2frame.c
-nodebug_sources = 
+nodebug_sources =
 else
-debug_sources   = 
+debug_sources   =
 nodebug_sources = greedy2frame.c
 endif
 
diff --git a/src/post/deinterlace/plugins/greedy.c b/src/post/deinterlace/plugins/greedy.c
--- a/src/post/deinterlace/plugins/greedy.c
+++ b/src/post/deinterlace/plugins/greedy.c
@@ -49,7 +49,7 @@
 // upon which give the smaller comb factor, and then clip to avoid large damage
 // when wrong.
 //
-// I'd intended this to be part of a larger more elaborate method added to 
+// I'd intended this to be part of a larger more elaborate method added to
 // Blended Clip but this give too good results for the CPU to ignore here.
 
 static void copy_scanline( uint8_t *output,
@@ -135,7 +135,7 @@
         paddusb_r2r( mm3, mm2 ); // now = Max(L1,L3)
 
         pcmpeqb_r2r( mm7, mm7 ); // all ffffffff
-        psubusb_r2r( mm1, mm7 ); // - L1 
+        psubusb_r2r( mm1, mm7 ); // - L1
         paddusb_r2r( mm7, mm3 ); // add, may sat at fff..
         psubusb_r2r( mm7, mm3 ); // now = Min(L1,L3)
 
@@ -147,7 +147,7 @@
         paddusb_r2r( mm3, mm4 );        // now = Max(best,Min(L1,L3)
 
         pcmpeqb_r2r( mm7, mm7 );        // all ffffffff
-        psubusb_r2r( mm4, mm7 );        // - Max(best,Min(best,L3) 
+        psubusb_r2r( mm4, mm7 );        // - Max(best,Min(best,L3)
         paddusb_r2r( mm7, mm2 );        // add may sat at FFF..
         psubusb_r2r( mm7, mm2 );        // now = Min( Max(best, Min(L1,L3), L2 )=L2 clipped
 
diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c
--- a/src/post/deinterlace/plugins/greedy2frame_template.c
+++ b/src/post/deinterlace/plugins/greedy2frame_template.c
@@ -79,9 +79,9 @@
 
 /****************************************************************************
 ** Field 1 | Field 2 | Field 3 | Field 4 |
-**   T0    |         |    T1   |         | 
-**         |   M0    |         |    M1   | 
-**   B0    |         |    B1   |         | 
+**   T0    |         |    T1   |         |
+**         |   M0    |         |    M1   |
+**   B0    |         |    B1   |         |
 */
 
 
@@ -95,13 +95,13 @@
 #define MASKS_DEFINED
   static const int64_t __attribute__((__used__)) YMask    = 0x00ff00ff00ff00ffll;
   static const int64_t __attribute__((__used__)) Mask = 0x7f7f7f7f7f7f7f7fll;
-  static const int64_t __attribute__((__used__)) DwordOne = 0x0000000100000001ll;    
-  static const int64_t __attribute__((__used__)) DwordTwo = 0x0000000200000002ll;    
+  static const int64_t __attribute__((__used__)) DwordOne = 0x0000000100000001ll;
+  static const int64_t __attribute__((__used__)) DwordTwo = 0x0000000200000002ll;
   static int64_t qwGreedyTwoFrameThreshold;
 #endif
 
 #if defined(IS_SSE)
-static void DeinterlaceGreedy2Frame_SSE(uint8_t *output, int outstride, 
+static void DeinterlaceGreedy2Frame_SSE(uint8_t *output, int outstride,
                                  deinterlace_frame_data_t *data,
                                  int bottom_field, int second_field, int width, int height )
 #elif defined(IS_3DNOW)
@@ -133,7 +133,7 @@
     qwGreedyTwoFrameThreshold = GreedyTwoFrameThreshold;
     qwGreedyTwoFrameThreshold += (GreedyTwoFrameThreshold2 << 8);
     qwGreedyTwoFrameThreshold += (qwGreedyTwoFrameThreshold << 48) +
-                                (qwGreedyTwoFrameThreshold << 32) + 
+                                (qwGreedyTwoFrameThreshold << 32) +
                                 (qwGreedyTwoFrameThreshold << 16);
 
 
@@ -148,7 +148,7 @@
         M0 = data->f1;
         T0 = data->f2;
     }
-    
+
     if( bottom_field ) {
         M1 += stride;
         T1 += 0;
@@ -192,9 +192,9 @@
             "movq %2, %%mm3			\n\t"     // B1
             "movq %3, %%mm2			\n\t"     // M0
             : /* no output */
-            : "m" (*T1), "m" (*M1), 
+            : "m" (*T1), "m" (*M1),
               "m" (*B1), "m" (*M0), "m" (Mask) );
-          
+
 
           asm volatile(
        /* Figure out what to do with the scanline above the one we just copied.
@@ -269,7 +269,7 @@
             "pcmpgtb %3, %%mm5			\n\t"
             "pand    %%mm6, %%mm5		\n\t" /* get rid of sign bit */
 
-            "pcmpgtd %5, %%mm5			\n\t" 
+            "pcmpgtd %5, %%mm5			\n\t"
             "pandn   %5, %%mm5			\n\t"
             "paddd   %%mm5, %%mm4			\n\t"
 
@@ -305,9 +305,9 @@
 
             "movq    %%mm4, %%mm5			\n\t"
          /* mm4 now is 1 where we want to weave and 0 where we want to bob */
-            "pand    %%mm0, %%mm4			\n\t"                
-            "pandn   %%mm7, %%mm5			\n\t"                
-            "por     %%mm5, %%mm4			\n\t"                
+            "pand    %%mm0, %%mm4			\n\t"
+            "pandn   %%mm7, %%mm5			\n\t"
+            "por     %%mm5, %%mm4			\n\t"
 #ifdef IS_SSE
             "movntq %%mm4, %0			\n\t"
 #else
@@ -351,9 +351,9 @@
     }
     else
     {
-        xine_fast_memcpy(Dest, T1, stride); 
+        xine_fast_memcpy(Dest, T1, stride);
     }
-    
+
     /* clear out the MMX registers ready for doing floating point again */
     asm("emms\n\t");
 #endif
diff --git a/src/post/deinterlace/plugins/greedyhmacros.h b/src/post/deinterlace/plugins/greedyhmacros.h
--- a/src/post/deinterlace/plugins/greedyhmacros.h
+++ b/src/post/deinterlace/plugins/greedyhmacros.h
@@ -15,7 +15,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-// Define a few macros for CPU dependent instructions. 
+// Define a few macros for CPU dependent instructions.
 // I suspect I don't really understand how the C macro preprocessor works but
 // this seems to get the job done.          // TRB 7/01
 
@@ -35,9 +35,9 @@
 	"paddusb "mmrw",  "mmr1"\n\t"
 #define V_PAVGB_SSE(mmr1, mmr2, mmrw, smask)      "pavgb   "mmr2", "mmr1"\n\t"
 #define V_PAVGB_3DNOW(mmr1, mmr2, mmrw, smask)    "pavgusb "mmr2", "mmr1"\n\t"
-#define V_PAVGB(mmr1, mmr2, mmrw, smask)          V_PAVGB2(mmr1, mmr2, mmrw, smask, SSE_TYPE) 
-#define V_PAVGB2(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) 
-#define V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB_##ssetyp(mmr1, mmr2, mmrw, smask) 
+#define V_PAVGB(mmr1, mmr2, mmrw, smask)          V_PAVGB2(mmr1, mmr2, mmrw, smask, SSE_TYPE)
+#define V_PAVGB2(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp)
+#define V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB_##ssetyp(mmr1, mmr2, mmrw, smask)
 
 // some macros for pmaxub instruction
 #define V_PMAXUB_MMX(mmr1, mmr2) \
@@ -45,9 +45,9 @@
     "paddusb "mmr2", "mmr1"\n\t"
 #define V_PMAXUB_SSE(mmr1, mmr2)      "pmaxub "mmr2", "mmr1"\n\t"
 #define V_PMAXUB_3DNOW(mmr1, mmr2)    V_PMAXUB_MMX(mmr1, mmr2)  // use MMX version
-#define V_PMAXUB(mmr1, mmr2)          V_PMAXUB2(mmr1, mmr2, SSE_TYPE) 
-#define V_PMAXUB2(mmr1, mmr2, ssetyp) V_PMAXUB3(mmr1, mmr2, ssetyp) 
-#define V_PMAXUB3(mmr1, mmr2, ssetyp) V_PMAXUB_##ssetyp(mmr1, mmr2) 
+#define V_PMAXUB(mmr1, mmr2)          V_PMAXUB2(mmr1, mmr2, SSE_TYPE)
+#define V_PMAXUB2(mmr1, mmr2, ssetyp) V_PMAXUB3(mmr1, mmr2, ssetyp)
+#define V_PMAXUB3(mmr1, mmr2, ssetyp) V_PMAXUB_##ssetyp(mmr1, mmr2)
 
 // some macros for pminub instruction
 //      V_PMINUB(mmr1, mmr2, mmr work register)     mmr2 may NOT = mmrw
@@ -58,17 +58,17 @@
     "psubusb "mmrw", "mmr1"\n\t"
 #define V_PMINUB_SSE(mmr1, mmr2, mmrw)      "pminub "mmr2", "mmr1"\n\t"
 #define V_PMINUB_3DNOW(mmr1, mmr2, mmrw)    V_PMINUB_MMX(mmr1, mmr2, mmrw)  // use MMX version
-#define V_PMINUB(mmr1, mmr2, mmrw)          V_PMINUB2(mmr1, mmr2, mmrw, SSE_TYPE) 
-#define V_PMINUB2(mmr1, mmr2, mmrw, ssetyp) V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) 
-#define V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) V_PMINUB_##ssetyp(mmr1, mmr2, mmrw) 
+#define V_PMINUB(mmr1, mmr2, mmrw)          V_PMINUB2(mmr1, mmr2, mmrw, SSE_TYPE)
+#define V_PMINUB2(mmr1, mmr2, mmrw, ssetyp) V_PMINUB3(mmr1, mmr2, mmrw, ssetyp)
+#define V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) V_PMINUB_##ssetyp(mmr1, mmr2, mmrw)
 
 // some macros for movntq instruction
-//      V_MOVNTQ(mmr1, mmr2) 
+//      V_MOVNTQ(mmr1, mmr2)
 #define V_MOVNTQ_MMX(mmr1, mmr2)      "movq   "mmr2", "mmr1"\n\t"
 #define V_MOVNTQ_3DNOW(mmr1, mmr2)    "movq   "mmr2", "mmr1"\n\t"
 #define V_MOVNTQ_SSE(mmr1, mmr2)      "movntq "mmr2", "mmr1"\n\t"
-#define V_MOVNTQ(mmr1, mmr2)          V_MOVNTQ2(mmr1, mmr2, SSE_TYPE) 
-#define V_MOVNTQ2(mmr1, mmr2, ssetyp) V_MOVNTQ3(mmr1, mmr2, ssetyp) 
+#define V_MOVNTQ(mmr1, mmr2)          V_MOVNTQ2(mmr1, mmr2, SSE_TYPE)
+#define V_MOVNTQ2(mmr1, mmr2, ssetyp) V_MOVNTQ3(mmr1, mmr2, ssetyp)
 #define V_MOVNTQ3(mmr1, mmr2, ssetyp) V_MOVNTQ_##ssetyp(mmr1, mmr2)
 
 // end of macros
diff --git a/src/post/deinterlace/plugins/linearblend.c b/src/post/deinterlace/plugins/linearblend.c
--- a/src/post/deinterlace/plugins/linearblend.c
+++ b/src/post/deinterlace/plugins/linearblend.c
@@ -255,7 +255,7 @@
     uint8_t *b1 = data->b1;
 
     int i;
- 
+
     READ_PREFETCH_2048( t1 );
     READ_PREFETCH_2048( b1 );
     READ_PREFETCH_2048( m0 );
diff --git a/src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h b/src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h
--- a/src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h
+++ b/src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h
@@ -8,7 +8,7 @@
 
 #define MyMemCopy xine_fast_memcpy
 
-// Define a few macros for CPU dependent instructions. 
+// Define a few macros for CPU dependent instructions.
 // I suspect I don't really understand how the C macro preprocessor works but
 // this seems to get the job done.          // TRB 7/01
 
@@ -28,9 +28,9 @@
 	"paddusb "mmrw",  "mmr1"\n\t"
 #define V_PAVGB_SSE(mmr1, mmr2, mmrw, smask)      "pavgb   "mmr2", "mmr1"\n\t"
 #define V_PAVGB_3DNOW(mmr1, mmr2, mmrw, smask)    "pavgusb "mmr2", "mmr1"\n\t"
-#define V_PAVGB(mmr1, mmr2, mmrw, smask)          V_PAVGB2(mmr1, mmr2, mmrw, smask, SSE_TYPE) 
-#define V_PAVGB2(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) 
-#define V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB_##ssetyp(mmr1, mmr2, mmrw, smask) 
+#define V_PAVGB(mmr1, mmr2, mmrw, smask)          V_PAVGB2(mmr1, mmr2, mmrw, smask, SSE_TYPE)
+#define V_PAVGB2(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp)
+#define V_PAVGB3(mmr1, mmr2, mmrw, smask, ssetyp) V_PAVGB_##ssetyp(mmr1, mmr2, mmrw, smask)
 
 // some macros for pmaxub instruction
 #define V_PMAXUB_MMX(mmr1, mmr2) \
@@ -38,9 +38,9 @@
     "paddusb "mmr2", "mmr1"\n\t"
 #define V_PMAXUB_SSE(mmr1, mmr2)      "pmaxub "mmr2", "mmr1"\n\t"
 #define V_PMAXUB_3DNOW(mmr1, mmr2)    V_PMAXUB_MMX(mmr1, mmr2)  // use MMX version
-#define V_PMAXUB(mmr1, mmr2)          V_PMAXUB2(mmr1, mmr2, SSE_TYPE) 
-#define V_PMAXUB2(mmr1, mmr2, ssetyp) V_PMAXUB3(mmr1, mmr2, ssetyp) 
-#define V_PMAXUB3(mmr1, mmr2, ssetyp) V_PMAXUB_##ssetyp(mmr1, mmr2) 
+#define V_PMAXUB(mmr1, mmr2)          V_PMAXUB2(mmr1, mmr2, SSE_TYPE)
+#define V_PMAXUB2(mmr1, mmr2, ssetyp) V_PMAXUB3(mmr1, mmr2, ssetyp)
+#define V_PMAXUB3(mmr1, mmr2, ssetyp) V_PMAXUB_##ssetyp(mmr1, mmr2)
 
 // some macros for pminub instruction
 //      V_PMINUB(mmr1, mmr2, mmr work register)     mmr2 may NOT = mmrw
@@ -51,17 +51,17 @@
     "psubusb "mmrw", "mmr1"\n\t"
 #define V_PMINUB_SSE(mmr1, mmr2, mmrw)      "pminub "mmr2", "mmr1"\n\t"
 #define V_PMINUB_3DNOW(mmr1, mmr2, mmrw)    V_PMINUB_MMX(mmr1, mmr2, mmrw)  // use MMX version
-#define V_PMINUB(mmr1, mmr2, mmrw)          V_PMINUB2(mmr1, mmr2, mmrw, SSE_TYPE) 
-#define V_PMINUB2(mmr1, mmr2, mmrw, ssetyp) V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) 
-#define V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) V_PMINUB_##ssetyp(mmr1, mmr2, mmrw) 
+#define V_PMINUB(mmr1, mmr2, mmrw)          V_PMINUB2(mmr1, mmr2, mmrw, SSE_TYPE)
+#define V_PMINUB2(mmr1, mmr2, mmrw, ssetyp) V_PMINUB3(mmr1, mmr2, mmrw, ssetyp)
+#define V_PMINUB3(mmr1, mmr2, mmrw, ssetyp) V_PMINUB_##ssetyp(mmr1, mmr2, mmrw)
 
 // some macros for movntq instruction
-//      V_MOVNTQ(mmr1, mmr2) 
+//      V_MOVNTQ(mmr1, mmr2)
 #define V_MOVNTQ_MMX(mmr1, mmr2)      "movq   "mmr2", "mmr1"\n\t"
 #define V_MOVNTQ_3DNOW(mmr1, mmr2)    "movq   "mmr2", "mmr1"\n\t"
 #define V_MOVNTQ_SSE(mmr1, mmr2)      "movntq "mmr2", "mmr1"\n\t"
-#define V_MOVNTQ(mmr1, mmr2)          V_MOVNTQ2(mmr1, mmr2, SSE_TYPE) 
-#define V_MOVNTQ2(mmr1, mmr2, ssetyp) V_MOVNTQ3(mmr1, mmr2, ssetyp) 
+#define V_MOVNTQ(mmr1, mmr2)          V_MOVNTQ2(mmr1, mmr2, SSE_TYPE)
+#define V_MOVNTQ2(mmr1, mmr2, ssetyp) V_MOVNTQ3(mmr1, mmr2, ssetyp)
 #define V_MOVNTQ3(mmr1, mmr2, ssetyp) V_MOVNTQ_##ssetyp(mmr1, mmr2)
 
 // end of macros
diff --git a/src/post/deinterlace/pulldown.c b/src/post/deinterlace/pulldown.c
--- a/src/post/deinterlace/pulldown.c
+++ b/src/post/deinterlace/pulldown.c
@@ -47,7 +47,7 @@
  * Bot 2 : Drop
  * Top 3 : Merge
  * Bot 3 : Drop
- * Top 4 : Show 
+ * Top 4 : Show
  * Bot 4 : Drop
  * Top 5 : Drop
  * Bot 5 : Show
@@ -69,15 +69,15 @@
  *
  *         [       ]
  *         [  * *]                | 0    top      BC
- *           [* *  ]              | 1 BC bottom   BC 
+ *           [* *  ]              | 1 BC bottom   BC
  *
  *             [       ]
  *             [  * *]            | 0    top      CC
- *               [  * *]          | 0 CC bottom   CC 
+ *               [  * *]          | 0 CC bottom   CC
  *
  *                 [       ]
  *                 [* *  ]        | 1    top      DD
- *                   [  * *]      | 0 DD bottom   DD 
+ *                   [  * *]      | 0 DD bottom   DD
  *
  *
  *                     [* *  ]    | 1    top      AA
@@ -608,7 +608,7 @@
     if( action == PULLDOWN_SEQ_CC && !bottom_field )
         ret = 0;
     if( action == PULLDOWN_SEQ_DD && bottom_field )
-        ret = 0; 
+        ret = 0;
 
     return ret;
 }
diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c
--- a/src/post/deinterlace/speedy.c
+++ b/src/post/deinterlace/speedy.c
@@ -117,11 +117,11 @@
                                             uint8_t *background, int width,
                                             int a, int luma, int cb, int cr,
                                             int percentage );
-void (*packed444_to_nonpremultiplied_packed4444_scanline)( uint8_t *output, 
+void (*packed444_to_nonpremultiplied_packed4444_scanline)( uint8_t *output,
                                                            uint8_t *input,
                                                            int width, int alpha );
 void (*aspect_adjust_packed4444_scanline)( uint8_t *output,
-                                           uint8_t *input, 
+                                           uint8_t *input,
                                            int width,
                                            double pixel_aspect );
 void (*packed444_to_packed422_scanline)( uint8_t *output,
@@ -623,7 +623,7 @@
         paddw_r2r( mm1, mm2 );
 
         psllw_i2r( 6, mm2 );
-        pand_r2r( mm6, mm2 ); 
+        pand_r2r( mm6, mm2 );
 
         por_r2r ( mm3, mm2 );
 
@@ -638,7 +638,7 @@
         *output = (*t + *b + (*m << 1)) >> 2;
         output+=2; t+=2; b+=2; m+=2;
     }
-    
+
     emms();
 }
 #endif
@@ -662,7 +662,7 @@
     const mmx_t cmask = { 0xff00ff00ff00ff00ULL };
 
     // Get width in bytes.
-    width *= 2; 
+    width *= 2;
     i = width / 8;
     width -= i * 8;
 
@@ -1940,7 +1940,7 @@
 
 static int myround(double n)
 {
-  if (n >= 0) 
+  if (n >= 0)
     return (int)(n + 0.5);
   else
     return (int)(n - 0.5);
@@ -1957,7 +1957,7 @@
    * to one of each, add the following:
    *             + (fixed-point-factor / 2)         --- for rounding later
    *             + (Q-offset * fixed-point-factor)  --- to add the offset
-   *             
+   *
    */
   for (i = 0; i < 256; i++) {
     Y_R[i] = myround(0.299 * (double)i * 219.0 / 255.0 * (double)(1<<FP_BITS));
@@ -1989,7 +1989,7 @@
    * to one of each, add the following:
    *             + (fixed-point-factor / 2)         --- for rounding later
    *             + (Q-offset * fixed-point-factor)  --- to add the offset
-   *             
+   *
    */
 
   /* clip Y values under 16 */
@@ -2006,7 +2006,7 @@
     RGB_Y[i] = myround((1.0 * (double)(235) * 255.0 / 219.0 * (double)(1<<FP_BITS))
                        + (double)(1<<(FP_BITS-1)));
   }
-    
+
   /* clip Cb/Cr values below 16 */
   for (i = 0; i < 16; i++) {
     R_Cr[i] = myround(1.402 * (double)(-112) * 255.0 / 224.0 * (double)(1<<FP_BITS));
@@ -2056,7 +2056,7 @@
         int g = input[ 1 ];
         int b = input[ 2 ];
         int a = input[ 3 ];
-        
+
         output[ 0 ] = a;
         output[ 1 ] = (Y_R[ r ] + Y_G[ g ] + Y_B[ b ]) >> FP_BITS;
         output[ 2 ] = (Cb_R[ r ] + Cb_G[ g ] + Cb_B[ b ]) >> FP_BITS;
@@ -2129,7 +2129,7 @@
 }
 */
 
-static void packed444_to_nonpremultiplied_packed4444_scanline_c( uint8_t *output, 
+static void packed444_to_nonpremultiplied_packed4444_scanline_c( uint8_t *output,
                                                                  uint8_t *input,
                                                                  int width, int alpha )
 {
@@ -2147,7 +2147,7 @@
 }
 
 static void aspect_adjust_packed4444_scanline_c( uint8_t *output,
-                                                 uint8_t *input, 
+                                                 uint8_t *input,
                                                  int width,
                                                  double pixel_aspect )
 {
@@ -2260,7 +2260,7 @@
 
             /* odd samples (21 -52 159 159 -52 21) */
             dst[ i2 + 1 ] = clip255( (   21*(src[im2]+src[ip3])
-                                      -  52*(src[im1]+src[ip2]) 
+                                      -  52*(src[im1]+src[ip2])
                                       + 159*(src[i]+src[ip1]) + 128 ) >> 8 );
         }
         src += w;
diff --git a/src/post/deinterlace/speedy.h b/src/post/deinterlace/speedy.h
--- a/src/post/deinterlace/speedy.h
+++ b/src/post/deinterlace/speedy.h
@@ -237,7 +237,7 @@
  * Simple function to convert a 4:4:4 scanline to a 4:4:4:4 scanline by
  * adding an alpha channel.  Result is non-premultiplied.
  */
-extern void (*packed444_to_nonpremultiplied_packed4444_scanline)( uint8_t *output, 
+extern void (*packed444_to_nonpremultiplied_packed4444_scanline)( uint8_t *output,
                                                                   uint8_t *input,
                                                                   int width, int alpha );
 
@@ -248,7 +248,7 @@
  * aspect ratio.
  */
 extern void (*aspect_adjust_packed4444_scanline)( uint8_t *output,
-                                                  uint8_t *input, 
+                                                  uint8_t *input,
                                                   int width,
                                                   double pixel_aspect );
 
diff --git a/src/post/deinterlace/tvtime.h b/src/post/deinterlace/tvtime.h
--- a/src/post/deinterlace/tvtime.h
+++ b/src/post/deinterlace/tvtime.h
@@ -98,4 +98,4 @@
 void tvtime_reset_context( tvtime_t *this );
 
 
-#endif 
+#endif
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -50,7 +50,7 @@
 static const post_info_t deinterlace_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 10, "tvtime", XINE_VERSION_CODE, &deinterlace_special_info, &deinterlace_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -66,7 +66,7 @@
 static void *help_string;
 
 /*
- * this is the struct used by "parameters api" 
+ * this is the struct used by "parameters api"
  */
 typedef struct deinterlace_parameters_s {
 
@@ -86,15 +86,15 @@
  * description of params struct
  */
 START_PARAM_DESCR( deinterlace_parameters_t )
-PARAM_ITEM( POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0,
             "deinterlace method" )
 PARAM_ITEM( POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0,
             "enable/disable" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0,
             "pulldown algorithm" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0,
             "number of frames of telecine pattern sync required before mode change" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0,
             "framerate output mode" )
 PARAM_ITEM( POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0,
             "make frames evenly spaced for film mode (24 fps)" )
@@ -129,7 +129,7 @@
   int                tvtime_changed;
   int                tvtime_last_filmmode;
   int                vo_deinterlace_enabled;
-  
+
   int                framecounter;
   uint8_t            rff_pattern;
 
@@ -144,10 +144,10 @@
   deinterlace_parameters_t init_param;
 } post_class_deinterlace_t;
 
-static void _flush_frames(post_plugin_deinterlace_t *this) 
+static void _flush_frames(post_plugin_deinterlace_t *this)
 {
   int i;
-  
+
   for( i = 0; i < NUM_RECENT_FRAMES; i++ ) {
     if( this->recent_frame[i] ) {
       this->recent_frame[i]->free(this->recent_frame[i]);
@@ -189,7 +189,7 @@
 static int get_parameters (xine_post_t *this_gen, void *param_gen) {
   post_plugin_deinterlace_t *this = (post_plugin_deinterlace_t *)this_gen;
   deinterlace_parameters_t *param = (deinterlace_parameters_t *)param_gen;
-  
+
   param->method = this->cur_method;
   param->enabled = this->enabled;
   param->pulldown = this->pulldown;
@@ -202,7 +202,7 @@
 
   return 1;
 }
- 
+
 static xine_post_api_descr_t * get_param_descr (void) {
   return &param_descr;
 }
@@ -307,7 +307,7 @@
 
   if (!class)
     return NULL;
-  
+
   class->class.open_plugin     = deinterlace_open_plugin;
   class->class.identifier      = "tvtime";
   class->class.description     = N_("advanced deinterlacer plugin with pulldown detection");
@@ -329,7 +329,7 @@
 
   filter_deinterlace_methods( config_flags, 5 /*fieldsavailable*/ );
   if( !get_num_deinterlace_methods() ) {
-      xprintf(xine, XINE_VERBOSITY_LOG, 
+      xprintf(xine, XINE_VERBOSITY_LOG,
 	      _("tvtime: No deinterlacing methods available, exiting.\n"));
       return NULL;
   }
@@ -342,7 +342,7 @@
     deinterlace_method_t *method;
 
     method = get_deinterlace_method(i);
-    
+
[... 353 lines omitted ...]
-                   frame->base[1], frame->pitches[1], 
-                   frame->base[2], frame->pitches[2], 
+      yv12_to_yuy2(frame->base[0], frame->pitches[0],
+                   frame->base[1], frame->pitches[1],
+                   frame->base[2], frame->pitches[2],
                    yuy2_frame->base[0], yuy2_frame->pitches[0],
-                   frame->width, frame->height, 
+                   frame->width, frame->height,
                    frame->progressive_frame || progressive );
-  
+
     } else {
       yuy2_frame = frame;
       yuy2_frame->lock(yuy2_frame);
@@ -781,10 +781,10 @@
     pthread_mutex_lock (&this->lock);
     /* check if frame format changed */
     for(i = 0; i < NUM_RECENT_FRAMES; i++ ) {
-      if( this->recent_frame[i] && 
-          (this->recent_frame[i]->width != frame->width || 
-           this->recent_frame[i]->height != frame->height || 
-           this->recent_frame[i]->format != yuy2_frame->format ) ) { 
+      if( this->recent_frame[i] &&
+          (this->recent_frame[i]->width != frame->width ||
+           this->recent_frame[i]->height != frame->height ||
+           this->recent_frame[i]->format != yuy2_frame->format ) ) {
         this->recent_frame[i]->free(this->recent_frame[i]);
         this->recent_frame[i] = NULL;
       }
@@ -797,10 +797,10 @@
       framerate_mode = FRAMERATE_HALF_TFF;
       this->tvtime->pulldown_alg = PULLDOWN_NONE;
     }
-    
+
     if( framerate_mode == FRAMERATE_FULL ) {
       int top_field_first = frame->top_field_first;
-      
+
       /* if i understood mpeg2 specs correctly, top_field_first
        * shall be zero for field pictures and the output order
        * is the same that the fields are decoded.
@@ -812,7 +812,7 @@
       if ( (frame->flags & VO_BOTH_FIELDS) != VO_BOTH_FIELDS ) {
         top_field_first = (frame->flags & VO_TOP_FIELD) ? 1 : 0;
       }
-      
+
       if ( top_field_first ) {
         fields[0] = 0;
         fields[1] = 1;
@@ -825,8 +825,8 @@
     } else if ( framerate_mode == FRAMERATE_HALF_BFF ) {
       fields[0] = 1;
     }
-    
-    
+
+
     if( progressive ) {
 
       /* If the previous field was interlaced and this one is progressive
@@ -838,10 +838,10 @@
        * duration is used in the calculation because the generated frame
        * represents the second half of the previous frame.
        */
-      if (this->recent_frame[0] && !this->recent_frame[0]->progressive_frame && 
+      if (this->recent_frame[0] && !this->recent_frame[0]->progressive_frame &&
           this->tvtime->curmethod->delaysfield)
       {
-	skip = deinterlace_build_output_field( 
+	skip = deinterlace_build_output_field(
           this, port, stream,
           frame, yuy2_frame,
           fields[0], 0,
@@ -867,19 +867,19 @@
       /* Build the output from the first field. */
       if ( !(this->recent_frame[0] && this->recent_frame[0]->progressive_frame &&
              this->tvtime->curmethod->delaysfield) ) {
-        skip = deinterlace_build_output_field( 
+        skip = deinterlace_build_output_field(
           this, port, stream,
           frame, yuy2_frame,
           fields[0], 0,
           frame->pts,
           (framerate_mode == FRAMERATE_FULL) ? frame->duration/2 : frame->duration,
           0);
-      }  
+      }
 
       if( framerate_mode == FRAMERATE_FULL ) {
-  
+
         /* Build the output from the second field. */
-        skip = deinterlace_build_output_field( 
+        skip = deinterlace_build_output_field(
           this, port, stream,
           frame, yuy2_frame,
           fields[1], 1,
@@ -889,7 +889,7 @@
       }
     }
 
-    /* don't drop frames when pulldown mode is enabled. otherwise 
+    /* don't drop frames when pulldown mode is enabled. otherwise
      * pulldown detection fails (yo-yo effect has also been seen)
      */
     if( this->pulldown )
@@ -897,7 +897,7 @@
 
     /* store back progressive flag for frame history */
     yuy2_frame->progressive_frame = progressive;
-      
+
     /* keep track of recent frames */
     i = NUM_RECENT_FRAMES-1;
     if( this->recent_frame[i] )
@@ -918,8 +918,8 @@
   } else {
     skip = frame->draw(frame, stream);
   }
-  
+
   _x_post_frame_copy_up(orig_frame, frame);
-  
+
   return skip;
 }

diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -71,19 +71,19 @@
   /* private data */
   xine_video_port_t *vo_port;
   post_out_t         video_output;
-  
+
   post_class_goom_t *class;
-  
+
   /* private metronom for syncing the video */
   metronom_t        *metronom;
-  
+
   /* goom context */
   PluginInfo        *goom;
-  
-  int data_idx; 
+
+  int data_idx;
   gint16 data [2][NUMSAMPLES];
   audio_buffer_t buf;   /* dummy buffer just to hold a copy of audio data */
-  
+
   int channels;
   int sample_rate;
   int samples_per_frame;
@@ -99,7 +99,7 @@
 
 
   yuv_planes_t yuv;
-  
+
   /* frame skipping */
   int skip_frame;
 };
@@ -110,12 +110,12 @@
 
 
 /* plugin catalog information */
-static const post_info_t goom_special_info = { 
+static const post_info_t goom_special_info = {
   XINE_POST_TYPE_AUDIO_VISUALIZATION
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 10, "goom", XINE_VERSION_CODE, &goom_special_info, &goom_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -142,7 +142,7 @@
 
 static void fps_changed_cb(void *data, xine_cfg_entry_t *cfg) {
   post_class_goom_t *class = (post_class_goom_t*) data;
-  
+
   if(class->ip) {
     post_plugin_goom_t *this = class->ip;
 
@@ -158,7 +158,7 @@
 
 static void width_changed_cb(void *data, xine_cfg_entry_t *cfg) {
   post_class_goom_t *class = (post_class_goom_t*) data;
-  
+
   if(class->ip) {
     post_plugin_goom_t *this = class->ip;
     this->width = cfg->num_value;
@@ -167,7 +167,7 @@
 
 static void height_changed_cb(void *data, xine_cfg_entry_t *cfg) {
   post_class_goom_t *class = (post_class_goom_t*) data;
-  
+
   if(class->ip) {
     post_plugin_goom_t *this = class->ip;
     this->height = cfg->num_value;
@@ -176,7 +176,7 @@
 
 static void csc_method_changed_cb(void *data, xine_cfg_entry_t *cfg) {
   post_class_goom_t *class = (post_class_goom_t*) data;
-  
+
   if(class->ip) {
     post_plugin_goom_t *this = class->ip;
     this->csc_method = cfg->num_value;
@@ -190,14 +190,14 @@
 
   if (!this)
     return NULL;
-  
+
   this->class.open_plugin     = goom_open_plugin;
   this->class.identifier      = "goom";
   this->class.description     = N_("What a GOOM");
   this->class.dispose         = goom_class_dispose;
   this->ip                    = NULL;
   this->xine                  = xine;
-  
+
   cfg = xine->config;
 
[... 134 lines omitted ...]
@@ -395,18 +395,18 @@
   free_yuv_planes(&this->yuv);
 
   port->stream = NULL;
-  
+
   this->vo_port->close(this->vo_port, XINE_ANON_STREAM);
   this->metronom->set_master(this->metronom, NULL);
- 
+
   port->original_port->close(port->original_port, stream );
-  
+
   _x_post_dec_usage(port);
 }
 
-static void goom_port_put_buffer (xine_audio_port_t *port_gen, 
+static void goom_port_put_buffer (xine_audio_port_t *port_gen,
                              audio_buffer_t *buf, xine_stream_t *stream) {
-  
+
   post_audio_port_t  *port = (post_audio_port_t *)port_gen;
   post_plugin_goom_t *this = (post_plugin_goom_t *)port->post;
   vo_frame_t         *frame;
@@ -419,28 +419,28 @@
   int width, height;
 
   int current_sample = 0;
-  
+
   /* make a copy of buf data for private use */
   if( this->buf.mem_size < buf->mem_size ) {
     this->buf.mem = realloc(this->buf.mem, buf->mem_size);
     this->buf.mem_size = buf->mem_size;
   }
-  memcpy(this->buf.mem, buf->mem, 
+  memcpy(this->buf.mem, buf->mem,
          buf->num_frames*this->channels*((port->bits == 8)?1:2));
   this->buf.num_frames = buf->num_frames;
-  
+
   /* pass data to original port */
-  port->original_port->put_buffer(port->original_port, buf, stream);  
-  
+  port->original_port->put_buffer(port->original_port, buf, stream);
+
   /* we must not use original data anymore, it should have already being moved
    * to the fifo of free audio buffers. just use our private copy instead.
    */
-  buf = &this->buf; 
+  buf = &this->buf;
   j = (this->channels >= 2) ? 1 : 0;
 
 
   while (current_sample < buf->num_frames) {
-  
+
   if (this->do_samples_skip) {
     if (current_sample + this->left_to_read > buf->num_frames) {
       this->left_to_read -= (buf->num_frames-current_sample);
@@ -449,14 +449,14 @@
       current_sample+=this->left_to_read;
       this->left_to_read = NUMSAMPLES;
       this->do_samples_skip = 0;
-      
+
     }
   } else {
 
     if( port->bits == 8 ) {
       data8 = (int8_t *)buf->mem;
       data8 += current_sample * this->channels;
-  
+
       /* scale 8 bit data to 16 bits and convert to signed as well */
       for ( i=current_sample ; this->data_idx < NUMSAMPLES && i < buf->num_frames;
         i++, this->data_idx++,data8 += this->channels) {
@@ -495,13 +495,13 @@
       frame = this->vo_port->get_frame (this->vo_port, this->width_back, this->height_back,
                 this->ratio, XINE_IMGFMT_YUY2,
                 VO_BOTH_FIELDS);
-      
+
       frame->extra_info->invalid = 1;
-      
+
       frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
       frame->pts = pts;
       this->metronom->got_video_frame(this->metronom, frame);
-      
+
       if (!this->skip_frame) {
         /* Try to be fast */
         goom_frame = (uint8_t *)goom_update (this->goom, this->data, 0, 0, NULL, NULL);
@@ -509,13 +509,13 @@
         dest_ptr = frame -> base[0];
         goom_frame_end = goom_frame + 4 * (this->width_back * this->height_back);
 
-        if ((this->csc_method == 1) && 
+        if ((this->csc_method == 1) &&
             (xine_mm_accel() & MM_ACCEL_X86_MMX)) {
           int plane_ptr = 0;
 
           while (goom_frame < goom_frame_end) {
             uint8_t r, g, b;
-      
+
             /* don't take endianness into account since MMX is only available
              * on Intel processors */
             b = *goom_frame; goom_frame++;
@@ -551,7 +551,7 @@
             g2 = *goom_frame; goom_frame++;
             r2 = *goom_frame; goom_frame += 2;
 #endif
-      
+
             *dest_ptr = COMPUTE_Y(r1, g1, b1);
             dest_ptr++;
             *dest_ptr = COMPUTE_U(r1, g1, b1);
@@ -573,7 +573,7 @@
       }
 
       frame->free(frame);
-      
+
       width  = this->width;
       height = this->height;
       if ((width != this->width_back) || (height != this->height_back)) {

diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c
--- a/src/post/mosaico/mosaico.c
+++ b/src/post/mosaico/mosaico.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
+
 /*
  * simple video mosaico plugin
  */
@@ -44,7 +44,7 @@
 static const post_info_t mosaico_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_POST, 10, "mosaico", XINE_VERSION_CODE, &mosaico_special_info, &mosaico_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -84,9 +84,9 @@
 };
 
 struct post_mosaico_s {
-  post_plugin_t    post;  
+  post_plugin_t    post;
   xine_post_in_t   parameter_input;
-  
+
   mosaico_pip_t   *pip;
   int64_t          vpts_limit;
   pthread_cond_t   vpts_limit_changed;
@@ -127,7 +127,7 @@
 
   if (!this)
     return NULL;
-  
+
   this->class.open_plugin     = mosaico_open_plugin;
   this->class.identifier      = "mosaico";
   this->class.description     = N_("Mosaico is a picture in picture (pip) post plugin");
@@ -146,17 +146,17 @@
   xine_post_in_t       *input_api;
   post_out_t           *output;
   post_video_port_t    *port;
-  static xine_post_api_t post_api = 
+  static xine_post_api_t post_api =
     { mosaico_set_parameters, mosaico_get_parameters, mosaico_get_param_descr, mosaico_get_help };
   int i;
-    
+
   lprintf("mosaico open\n");
 
   if (inputs < 2 || !this || !video_target || !video_target[0]) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 0, inputs);
 
   this->pip       = (mosaico_pip_t *)calloc((inputs - 1), sizeof(mosaico_pip_t));
@@ -164,7 +164,7 @@
 
   pthread_cond_init(&this->vpts_limit_changed, NULL);
   pthread_mutex_init(&this->mutex, NULL);
-  
+
   /* the port for the background video */
   port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
   port->intercept_frame = mosaico_intercept_frame;
@@ -180,7 +180,7 @@
     this->pip[i].w = 150;
     this->pip[i].h = 150;
     asprintf(&(this->pip[i].input_name), "video in %d", i+1);
-    
+
     port = _x_post_intercept_video_port(&this->post, video_target[0], &input, NULL);
     port->new_port.close  = mosaico_close;
     port->intercept_frame = mosaico_intercept_frame;
@@ -205,7 +205,7 @@
 static void mosaico_dispose(post_plugin_t *this_gen)
 {
   post_mosaico_t *this = (post_mosaico_t *)this_gen;
-  
+
   if (_x_post_dispose(this_gen)) {
     int i;
     for (i = 0; i < this->pip_count; i++)
@@ -227,7 +227,7 @@
 {
   post_mosaico_t *this = (post_mosaico_t *)this_gen;
   mosaico_parameters_t *param = (mosaico_parameters_t *)param_gen;
-  
+
   if (param->pip_num > this->pip_count) return 0;
   this->pip[param->pip_num - 1].x = param->x;
   this->pip[param->pip_num - 1].y = param->y;
@@ -240,7 +240,7 @@
 {
   post_mosaico_t *this = (post_mosaico_t *)this_gen;
   mosaico_parameters_t *param = (mosaico_parameters_t *)param_gen;
-  
+
   if (param->pip_num > this->pip_count || param->pip_num < 1)
     param->pip_num = 1;
   param->x = this->pip[param->pip_num - 1].x;
[... 39 lines omitted ...]
+    break;
+
   case XINE_IMGFMT_YV12:
     /* Y */
     target_offset = 0;
@@ -363,7 +363,7 @@
     pos = pos_y * background_width + pos_x;
     target_width = (target_width + 1) / 2;
     target_height = (target_height + 1) / 2;
-    
+
     /* U */
     target_offset = 0;
     for (j = 0; j < target_height; j++, target_offset += (background_width - target_width))
@@ -371,7 +371,7 @@
 	source_offset = ((i * scale_x) >> shift_x) + (((j * scale_y) >> shift_y) * source_width);
 	background->base[1][pos + target_offset] = this->pip[pip_num].frame->base[1][source_offset];
       }
-    
+
     /* V */
     target_offset = 0;
     for (j = 0; j < target_height; j++, target_offset += (background_width - target_width))
@@ -379,7 +379,7 @@
 	source_offset = ((i * scale_x) >> shift_x) + (((j * scale_y) >> shift_y) * source_width);
 	background->base[2][pos + target_offset] = this->pip[pip_num].frame->base[2][source_offset];
       }
-    
+
     break;
   }
 }
@@ -392,47 +392,47 @@
   int pip_num, skip;
 
   pthread_mutex_lock(&this->mutex);
-  
+
   if (frame->bad_frame) {
     _x_post_frame_copy_down(frame, frame->next);
     skip = frame->next->draw(frame->next, stream);
     _x_post_frame_copy_up(frame, frame->next);
-    
+
     this->vpts_limit = frame->vpts + frame->duration;
     if (skip) {
       this->skip      = skip;
       this->skip_vpts = frame->vpts;
     } else
       this->skip      = 0;
-    
+
     pthread_mutex_unlock(&this->mutex);
     pthread_cond_broadcast(&this->vpts_limit_changed);
-    
+
     return skip;
   }
-  
+
   background = port->original_port->get_frame(port->original_port,
     frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS);
   _x_post_frame_copy_down(frame, background);
   frame_copy_content(background, frame);
-  
+
   for (pip_num = 0; pip_num < this->pip_count; pip_num++)
     frame_paste(this, background, pip_num);
-  
+
   skip = background->draw(background, stream);
   _x_post_frame_copy_up(frame, background);
   this->vpts_limit = background->vpts + background->duration;
   background->free(background);
-  
+
   if (skip) {
     this->skip      = skip;
     this->skip_vpts = frame->vpts;
   } else
     this->skip      = 0;
-  
+
   pthread_mutex_unlock(&this->mutex);
   pthread_cond_broadcast(&this->vpts_limit_changed);
-  
+
   return skip;
 }
 
@@ -446,11 +446,11 @@
   for (pip_num = 0; pip_num < this->pip_count; pip_num++)
     if (this->post.xine_post.video_input[pip_num+1] == frame->port) break;
   _x_assert(pip_num < this->pip_count);
-  
+
   frame->lock(frame);
-  
+
   pthread_mutex_lock(&this->mutex);
-  
+
   /* the original output will never see this frame again */
   _x_post_frame_u_turn(frame, stream);
   while (frame->vpts > this->vpts_limit || !this->vpts_limit)
@@ -459,12 +459,12 @@
   free_frame = this->pip[pip_num].frame;
   if (port->stream)
     this->pip[pip_num].frame = frame;
-  
+
   if (this->skip && frame->vpts <= this->skip_vpts)
     skip = this->skip;
   else
     skip = 0;
-  
+
   pthread_mutex_unlock(&this->mutex);
 
   if (free_frame)
@@ -473,6 +473,6 @@
     /* do not keep this frame when no stream is connected to us,
      * otherwise, this frame might never get freed */
     frame->free(frame);
-  
+
   return skip;
 }

diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c
--- a/src/post/mosaico/switch.c
+++ b/src/post/mosaico/switch.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
- 
+
 /*
  * simple switch video post plugin
  */
@@ -40,7 +40,7 @@
 static const post_info_t switch_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_POST, 10, "switch", XINE_VERSION_CODE, &switch_special_info, &switch_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
@@ -67,7 +67,7 @@
 struct post_switch_s {
   post_plugin_t    post;
   xine_post_in_t   parameter_input;
-  
+
   int64_t          vpts_limit;
   pthread_cond_t   display_condition_changed;
   int64_t          skip_vpts;
@@ -102,7 +102,7 @@
 
   if (!this)
     return NULL;
-  
+
   this->class.open_plugin     = switch_open_plugin;
   this->class.identifier      = "switch";
   this->class.description     = N_("Switch is a post plugin able to switch at any time between different streams");
@@ -124,28 +124,28 @@
   static xine_post_api_t post_api =
     { switch_set_parameters, switch_get_parameters, switch_get_param_descr, switch_get_help };
   int i;
-    
+
   lprintf("switch open\n");
 
   if (inputs < 2 || !this || !video_target || !video_target[0]) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 0, inputs);
 
   this->source_count    = inputs;
   this->selected_source = 1;
-  
+
   pthread_cond_init(&this->display_condition_changed, NULL);
   pthread_mutex_init(&this->mutex, NULL);
-  
+
   port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
   port->new_frame->draw = switch_draw;
   port->port_lock       = &this->mutex;
   port->frame_lock      = &this->mutex;
   this->post.xine_post.video_input[0] = &port->new_port;
-  
+
   for (i = 1; i < inputs; i++) {
     port = _x_post_intercept_video_port(&this->post, video_target[0], &input, NULL);
     port->new_frame->draw = switch_draw;
@@ -153,7 +153,7 @@
     port->frame_lock      = &this->mutex;
     this->post.xine_post.video_input[i] = &port->new_port;
   }
-  
+
   input_api       = &this->parameter_input;
   input_api->name = "parameters";
   input_api->type = XINE_POST_DATA_PARAMETERS;
@@ -168,7 +168,7 @@
 static void switch_dispose(post_plugin_t *this_gen)
 {
   post_switch_t *this = (post_switch_t *)this_gen;
-  
+
   if (_x_post_dispose(this_gen)) {
     pthread_cond_destroy(&this->display_condition_changed);
     pthread_mutex_destroy(&this->mutex);
@@ -186,7 +186,7 @@
 {
   post_switch_t *this = (post_switch_t *)this_gen;
   switch_parameter_t *param = (switch_parameter_t *)param_gen;
-  
+
   if (param->select > this->source_count) return 0;
   pthread_mutex_lock(&this->mutex);
   this->selected_source = param->select;
@@ -199,7 +199,7 @@
 {
   post_switch_t *this = (post_switch_t *)this_gen;
   switch_parameter_t *param = (switch_parameter_t *)param_gen;
-  
+
   param->select = this->selected_source;
   return 1;
 }
@@ -222,7 +222,7 @@
   for (source_num = 1; source_num <= this->source_count; source_num++)
     if (this->post.xine_post.video_input[source_num-1] == frame->port) break;
   _x_assert(source_num <= this->source_count);
-  
+
   pthread_mutex_lock(&this->mutex);
   /* the original output will probably never see this frame again */
   _x_post_frame_u_turn(frame, stream);
@@ -249,6 +249,6 @@
       skip = 0;
     pthread_mutex_unlock(&this->mutex);
   }
-  
+
   return skip;
 }
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -2,8 +2,8 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(VISIBILITY_FLAG)
-AM_CPPFLAGS = 
-AM_LDFLAGS  = 
+AM_CPPFLAGS =
+AM_LDFLAGS  =
 
 noinst_LTLIBRARIES = libpost_planar_asm.la
 libpost_planar_asm_la_SOURCES = eq.c eq2.c noise.c
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -36,7 +36,7 @@
 typedef struct post_plugin_boxblur_s post_plugin_boxblur_t;
 
 /*
- * this is the struct used by "parameters api" 
+ * this is the struct used by "parameters api"
  */
 typedef struct boxblur_parameters_s {
 
@@ -51,13 +51,13 @@
  * description of params struct
  */
 START_PARAM_DESCR( boxblur_parameters_t )
-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_radius, NULL, 0, 10, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, luma_radius, NULL, 0, 10, 0,
             "radius of luma blur" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_power, NULL, 0, 10, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, luma_power, NULL, 0, 10, 0,
             "power of luma blur" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_radius, NULL, -1, 10, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_radius, NULL, -1, 10, 0,
             "radius of chroma blur (-1 = same as luma)" )
-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_power, NULL, -1, 10, 0, 
+PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_power, NULL, -1, 10, 0,
             "power of chroma blur (-1 = same as luma)" )
 END_PARAM_DESCR( param_descr )
 
@@ -96,7 +96,7 @@
 
   return 1;
 }
- 
+
 static xine_post_api_descr_t * get_param_descr (void) {
   return &param_descr;
 }
@@ -141,7 +141,7 @@
 
   if (!class)
     return NULL;
-  
+
   class->open_plugin     = boxblur_open_plugin;
   class->identifier      = "boxblur";
   class->description     = N_("box blur filter from mplayer");
@@ -160,14 +160,14 @@
   xine_post_in_t        *input_api;
   post_out_t            *output;
   post_video_port_t     *port;
-  
+
   if (!this || !video_target || !video_target[0]) {
     free(this);
     return NULL;
   }
-  
+
   _x_post_init(&this->post, 0, 1);
-  
+
   this->params.luma_radius = 2;
   this->params.luma_power = 1;
   this->params.chroma_radius = -1;
@@ -178,7 +178,7 @@
   port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
   port->intercept_frame = boxblur_intercept_frame;
   port->new_frame->draw = boxblur_draw;
-  
+
   input_api       = &this->params_input;
   input_api->name = "parameters";
   input_api->type = XINE_POST_DATA_PARAMETERS;
@@ -187,18 +187,18 @@
 
   input->xine_in.name     = "video";
   output->xine_out.name   = "boxblured video";
-  
+
   this->post.xine_post.video_input[0] = &port->new_port;
-  
+
   this->post.dispose = boxblur_dispose;
-  
+
   return &this->post;
 }
 
 static void boxblur_dispose(post_plugin_t *this_gen)
 {
   post_plugin_boxblur_t *this = (post_plugin_boxblur_t *)this_gen;
-  
+
   if (_x_post_dispose(this_gen)) {
     pthread_mutex_destroy(&this->lock);
     free(this);
@@ -243,7 +243,7 @@
 static inline void blur2(uint8_t *dst, uint8_t *src, int w, int radius, int power, int dstStep, int srcStep){
 	uint8_t temp[2][4096];
 	uint8_t *a= temp[0], *b=temp[1];
-	
+
 	if(radius){
 		blur(a, src, w, radius, 1, srcStep);
 		for(; power>2; power--){
@@ -267,9 +267,9 @@
 
 static void hBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
 	int y;
-	
+
 	if(radius==0 && dst==src) return;
-	
+
 	for(y=0; y<h; y++){
 		blur2(dst + y*dstStride, src + y*srcStride, w, radius, power, 1, 1);
 	}
@@ -277,7 +277,7 @@
 
 static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
 	int x;
-	
+
 	if(radius==0 && dst==src) return;
 
 	for(x=0; x<w; x++){
@@ -326,25 +326,25 @@
 
     pthread_mutex_lock (&this->lock);
 
-    chroma_radius = (this->params.chroma_radius != -1) ? this->params.chroma_radius : 
+    chroma_radius = (this->params.chroma_radius != -1) ? this->params.chroma_radius :
                                                          this->params.luma_radius;
-    chroma_power = (this->params.chroma_power != -1) ? this->params.chroma_power : 
+    chroma_power = (this->params.chroma_power != -1) ? this->params.chroma_power :
                                                        this->params.luma_power;
     cw = yv12_frame->width/2;
     ch = yv12_frame->height/2;
 
-    hBlur(out_frame->base[0], yv12_frame->base[0], yv12_frame->width, yv12_frame->height, 
+    hBlur(out_frame->base[0], yv12_frame->base[0], yv12_frame->width, yv12_frame->height,
           out_frame->pitches[0], yv12_frame->pitches[0], this->params.luma_radius, this->params.luma_power);
-    hBlur(out_frame->base[1], yv12_frame->base[1], cw,ch, 
+    hBlur(out_frame->base[1], yv12_frame->base[1], cw,ch,
           out_frame->pitches[1], yv12_frame->pitches[1], chroma_radius, chroma_power);
-    hBlur(out_frame->base[2], yv12_frame->base[2], cw,ch, 
+    hBlur(out_frame->base[2], yv12_frame->base[2], cw,ch,
           out_frame->pitches[2], yv12_frame->pitches[2], chroma_radius, chroma_power);
 
-    vBlur(out_frame->base[0], out_frame->base[0], yv12_frame->width, yv12_frame->height, 
+    vBlur(out_frame->base[0], out_frame->base[0], yv12_frame->width, yv12_frame->height,
           out_frame->pitches[0], out_frame->pitches[0], this->params.luma_radius, this->params.luma_power);
-    vBlur(out_frame->base[1], out_frame->base[1], cw,ch, 
+    vBlur(out_frame->base[1], out_frame->base[1], cw,ch,
           out_frame->pitches[1], out_frame->pitches[1], chroma_radius, chroma_power);
-    vBlur(out_frame->base[2], out_frame->base[2], cw,ch, 
+    vBlur(out_frame->base[2], out_frame->base[2], cw,ch,
           out_frame->pitches[2], out_frame->pitches[2], chroma_radius, chroma_power);
 
     pthread_mutex_unlock (&this->lock);

# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 7]

diff --git a/src/video_dec/rgb.c b/src/video_dec/rgb.c
--- a/src/video_dec/rgb.c
+++ b/src/video_dec/rgb.c
@@ -27,7 +27,7 @@
  * file can be 32-, 24-, 16-, 8-, 4-, 2-, or 1-bit. Any resolutions <= 8
  * can also be greyscale depending on what the QT file specifies.
  *
- * One more catch: Raw RGB from a Microsoft file is upside down. This is 
+ * One more catch: Raw RGB from a Microsoft file is upside down. This is
  * indicated by a negative height parameter.
  */
 
@@ -80,7 +80,7 @@
 
   unsigned char     yuv_palette[256 * 4];
   yuv_planes_t      yuv_planes;
-  
+
 } rgb_decoder_t;
 
 static void rgb_decode_data (video_decoder_t *this_gen,
@@ -121,7 +121,7 @@
     this->video_step = buf->decoder_info[0];
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
   }
-  
+
   if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     (this->stream->video_out->open) (this->stream->video_out, this->stream);
 
@@ -194,11 +194,11 @@
 
               palette_index = this->buf[buf_ptr++];
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 0];
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 1];
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 2];
 
             } else if (this->bytes_per_pixel == 2) {
@@ -208,11 +208,11 @@
               buf_ptr += 2;
               UNPACK_BGR15(packed_pixel, r, g, b);
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 COMPUTE_Y(r, g, b);
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 COMPUTE_U(r, g, b);
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 COMPUTE_V(r, g, b);
 
             } else {
@@ -225,11 +225,11 @@
               /* the next line takes care of 'A' in the 32-bit case */
               buf_ptr += this->bytes_per_pixel - 3;
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 COMPUTE_Y(r, g, b);
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 COMPUTE_U(r, g, b);
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 COMPUTE_V(r, g, b);
 
             }
@@ -249,18 +249,18 @@
               }
 
               if (pixel_byte & 0x80) {
-                this->yuv_planes.y[row_ptr + pixel_ptr] = 
+                this->yuv_planes.y[row_ptr + pixel_ptr] =
                   this->yuv_palette[1 * 4 + 0];
-                this->yuv_planes.u[row_ptr + pixel_ptr] = 
+                this->yuv_planes.u[row_ptr + pixel_ptr] =
                   this->yuv_palette[1 * 4 + 1];
-                this->yuv_planes.v[row_ptr + pixel_ptr] = 
+                this->yuv_planes.v[row_ptr + pixel_ptr] =
                   this->yuv_palette[1 * 4 + 2];
               } else {
-                this->yuv_planes.y[row_ptr + pixel_ptr] = 
+                this->yuv_planes.y[row_ptr + pixel_ptr] =
                   this->yuv_palette[0 * 4 + 0];
-                this->yuv_planes.u[row_ptr + pixel_ptr] = 
+                this->yuv_planes.u[row_ptr + pixel_ptr] =
                   this->yuv_palette[0 * 4 + 1];
-                this->yuv_planes.v[row_ptr + pixel_ptr] = 
+                this->yuv_planes.v[row_ptr + pixel_ptr] =
                   this->yuv_palette[0 * 4 + 2];
               }
               pixels_left--;
@@ -274,11 +274,11 @@
               }
 
               palette_index = (pixel_byte & 0xC0) >> 6;
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 0];
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 1];
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 2];
 
               pixels_left--;
@@ -292,11 +292,11 @@
               }
 
               palette_index = (pixel_byte & 0xF0) >> 4;
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 0];
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 1];
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 2];
 
               pixels_left--;
@@ -306,11 +306,11 @@
 
               palette_index = this->buf[buf_ptr++];
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 0];
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 1];
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 this->yuv_palette[palette_index * 4 + 2];
 
             } else if (this->bytes_per_pixel == 2) {
@@ -320,16 +320,16 @@
               buf_ptr += 2;
               UNPACK_RGB15(packed_pixel, r, g, b);
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 COMPUTE_Y(r, g, b);
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 COMPUTE_U(r, g, b);
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 COMPUTE_V(r, g, b);
 
             } else {
 
-              /* RGB24 or ARGB32; the next line takes care of 'A' in the 
+              /* RGB24 or ARGB32; the next line takes care of 'A' in the
                * 32-bit case */
               buf_ptr += this->bytes_per_pixel - 3;
 
@@ -337,11 +337,11 @@
               g = this->buf[buf_ptr++];
               b = this->buf[buf_ptr++];
 
-              this->yuv_planes.y[row_ptr + pixel_ptr] = 
+              this->yuv_planes.y[row_ptr + pixel_ptr] =
                 COMPUTE_Y(r, g, b);
-              this->yuv_planes.u[row_ptr + pixel_ptr] = 
+              this->yuv_planes.u[row_ptr + pixel_ptr] =
                 COMPUTE_U(r, g, b);
-              this->yuv_planes.v[row_ptr + pixel_ptr] = 
+              this->yuv_planes.v[row_ptr + pixel_ptr] =
                 COMPUTE_V(r, g, b);
 
             }
@@ -434,7 +434,7 @@
  * exported plugin catalog entry
  */
 
-static const uint32_t video_types[] = { 
+static const uint32_t video_types[] = {
   BUF_VIDEO_RGB,
   0
  };
@@ -445,7 +445,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER, 19, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_dec/yuv.c b/src/video_dec/yuv.c
--- a/src/video_dec/yuv.c
+++ b/src/video_dec/yuv.c
@@ -62,7 +62,7 @@
   int               width;       /* the width of a video frame */
   int               height;      /* the height of a video frame */
   double            ratio;       /* the width to height ratio */
-  
+
   int               progressive;
   int               top_field_first;
 
@@ -104,10 +104,10 @@
       this->ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
     else
       this->ratio = (double)this->width / (double)this->height;
-    
+
     this->progressive = buf->decoder_info[3];
     this->top_field_first = buf->decoder_info[4];
-            
+
     free (this->buf);
     this->buf = NULL;
 
@@ -123,7 +123,7 @@
       case BUF_VIDEO_YUY2:
         _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YUY2");
         break;
-      
+
       case BUF_VIDEO_YV12:
         _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
         break;
@@ -135,13 +135,13 @@
       case BUF_VIDEO_GREY:
         _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
         break;
-        
+
       case BUF_VIDEO_I420:
         _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
         break;
 
     }
-    
+
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,  this->width);
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height);
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO,  this->ratio*10000);
@@ -164,14 +164,14 @@
       xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
 
       this->size += buf->size;
-      
+
       src = this->buf;
     }
 
     if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
 
       if (buf->type == BUF_VIDEO_YUY2) {
-      
+
         img = this->stream->video_out->get_frame (this->stream->video_out,
                                           this->width, this->height,
                                           this->ratio, XINE_IMGFMT_YUY2, VO_BOTH_FIELDS);
@@ -182,14 +182,14 @@
          /* dst */
           img->base[0], img->pitches[0],
          /* width x height */
-          this->width, this->height);      
-      
+          this->width, this->height);
+
       } else if (buf->type == BUF_VIDEO_YV12) {
 
         img = this->stream->video_out->get_frame (this->stream->video_out,
                                           this->width, this->height,
                                           this->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
-        
+
         yv12_to_yv12(
          /* Y */
           src, this->width,
@@ -204,7 +204,7 @@
           this->width, this->height);
 
       } else if (buf->type == BUF_VIDEO_I420) {
-      
+
         img = this->stream->video_out->get_frame (this->stream->video_out,
                                           this->width, this->height,
                                           this->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
@@ -231,17 +231,17 @@
 
         yuv9_to_yv12(
          /* Y */
-          src, 
+          src,
           this->width,
-          img->base[0], 
+          img->base[0],
           img->pitches[0],
          /* U */
-          src + (this->width * this->height), 
+          src + (this->width * this->height),
           this->width / 4,
           img->base[1],
           img->pitches[1],
          /* V */
-          src + (this->width * this->height) + 
+          src + (this->width * this->height) +
             (this->width * this->height / 16),
           this->width / 4,
           img->base[2],
@@ -356,8 +356,8 @@
  * exported plugin catalog entry
  */
 
-static const uint32_t video_types[] = { 
-  BUF_VIDEO_YUY2, 
+static const uint32_t video_types[] = {
+  BUF_VIDEO_YUY2,
   BUF_VIDEO_YV12,
   BUF_VIDEO_YVU9,
   BUF_VIDEO_GREY,
@@ -371,7 +371,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_DECODER, 19, "yuv", XINE_VERSION_CODE, &dec_info_video, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -5,7 +5,7 @@
 AM_LDFLAGS   = $(xineplug_ldflags)
 AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-SUBDIRS = 
+SUBDIRS =
 
 if ENABLE_MACOSX_VIDEO
 SUBDIRS += macosx
@@ -188,7 +188,7 @@
 xineplug_vo_out_stk_la_LIBADD = $(XINE_LIB) $(LIBSTK_LIBS) $(PTHREAD_LIBS)
 xineplug_vo_out_stk_la_CFLAGS = $(AM_CFLAGS) $(LIBSTK_CFLAGS)
 
-xineplug_vo_out_directx_la_SOURCES = video_out_directx.c 
+xineplug_vo_out_directx_la_SOURCES = video_out_directx.c
 xineplug_vo_out_directx_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(DIRECTX_VIDEO_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
 xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
 
diff --git a/src/video_out/macosx/video_window.h b/src/video_out/macosx/video_window.h
--- a/src/video_out/macosx/video_window.h
+++ b/src/video_out/macosx/video_window.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * Written by Daniel Mack <xine@...>
- * 
+ *
  * Most parts of this code were taken from VLC, http://www.videolan.org
  * Thanks for the good research!
  */
diff --git a/src/video_out/myglext.h b/src/video_out/myglext.h
--- a/src/video_out/myglext.h
+++ b/src/video_out/myglext.h
@@ -13,21 +13,21 @@
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
+**
 ** http://oss.sgi.com/projects/FreeB
-** 
+**
 ** Note that, as provided in the License, the Software is distributed on an
 ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
 ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
+**
 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
 ** Copyright in any portions created by third parties is as indicated
 ** elsewhere herein. All Rights Reserved.
-** 
+**
 ** Additional Notice Provisions: This software was created using the
 ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
 ** not been independently verified as being compliant with the OpenGL(R)
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -91,7 +91,7 @@
 
 static void aa_dispose_frame (vo_frame_t *vo_img) {
   aa_frame_t *frame = (aa_frame_t *)vo_img;
-  
+
   av_free (frame->vo_frame.base[0]);
   av_free (frame->vo_frame.base[1]);
   av_free (frame->vo_frame.base[2]);
@@ -119,19 +119,19 @@
   frame->vo_frame.field = aa_frame_field;
   frame->vo_frame.dispose = aa_dispose_frame;
   frame->vo_frame.driver = this_gen;
-  
+
   return (vo_frame_t*) frame;
 }
 
 static void aa_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
-				    uint32_t width, uint32_t height, 
+				    uint32_t width, uint32_t height,
 				    double ratio, int format, int flags) {
   aa_driver_t *this = (aa_driver_t*) this_gen;
   aa_frame_t  *frame = (aa_frame_t *) img;
 
   /* printf ("aa_update_format...\n"); */
 
-  if ((frame->width != width) || (frame->height != height) 
+  if ((frame->width != width) || (frame->height != height)
       || (frame->format != format)) {
 
     av_freep (&frame->vo_frame.base[0]);
@@ -194,27 +194,27 @@
   if (frame->format == XINE_IMGFMT_YV12) {
     for (y = 0; y<aa_imgheight (this->context); y++) {
       for (x = 0; x<aa_imgwidth (this->context); x++) {
-      
+
 	*img++ = src_image[((int)((double) x * x_fact) +
 			    frame->width * (int)((double) y * y_fact))];
-      
+
       }
     }
   } else {
     for (y = 0; y<aa_imgheight (this->context); y++) {
       for (x = 0; x<aa_imgwidth (this->context); x++) {
-      
+
 	*img++ = src_image[((int)((double) x * x_fact) * 2 +
 			    frame->width * 2 * (int)((double) y * y_fact))];
-      
+
       }
     }
   }
 
   frame->vo_frame.free (&frame->vo_frame);
 
-  aa_fastrender(this->context, 0, 0, 
-		aa_imgwidth (this->context), 
+  aa_fastrender(this->context, 0, 0,
+		aa_imgwidth (this->context),
 		aa_imgheight (this->context));
 
   aa_flush (this->context);
@@ -223,7 +223,7 @@
 
 static int aa_get_property (vo_driver_t *this_gen, int property) {
   aa_driver_t *this = (aa_driver_t*) this_gen;
-  
+
   if ( property == VO_PROP_ASPECT_RATIO) {
     return this->user_ratio ;
   } else {
@@ -234,7 +234,7 @@
   return 0;
 }
 
-static int aa_set_property (vo_driver_t *this_gen, 
+static int aa_set_property (vo_driver_t *this_gen,
 			    int property, int value) {
   aa_driver_t *this = (aa_driver_t*) this_gen;
 
@@ -251,7 +251,7 @@
   return value;
 }
 
-static void aa_get_property_min_max (vo_driver_t *this_gen, 
+static void aa_get_property_min_max (vo_driver_t *this_gen,
 				     int property, int *min, int *max) {
   *min = 0;
   *max = 0;
@@ -269,9 +269,9 @@
   aa_driver_t          *this;
 
   this = (aa_driver_t*) calloc(1, sizeof(aa_driver_t));
-  
+
   this->context = (aa_context*) visual_gen;
-  
+
   this->config = class->config;
   this->xine   = class->xine;
 
@@ -290,19 +290,19 @@
   this->vo_driver.dispose              = aa_dispose;
 
   return &this->vo_driver;
-}    
+}
 
 static void *init_class (xine_t *xine, void *visual_gen) {
   /* aa_context    *context = (aa_context*) visual_gen; */
   aa_class_t    *this;
-  
+
   this = calloc(1, sizeof(aa_class_t));
-  
+
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.identifier      = "AA";
   this->driver_class.description     = N_("xine video output plugin using the ascii-art library");
   this->driver_class.dispose         = default_video_driver_class_dispose;
-  
+
   this->config            = xine->config;
   this->xine              = xine;
 
@@ -315,7 +315,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2003, 2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -98,7 +98,7 @@
 
 static void caca_dispose_frame (vo_frame_t *vo_img) {
   caca_frame_t *frame = (caca_frame_t *)vo_img;
-  
+
   av_free (frame->vo_frame.base[0]);
   av_free (frame->vo_frame.base[1]);
   av_free (frame->vo_frame.base[2]);
@@ -136,17 +136,17 @@
   /* colorspace converter for this frame */
   frame->yuv2rgb =
     this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
-  
+
   return (vo_frame_t*) frame;
 }
 
 static void caca_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
-                                      uint32_t width, uint32_t height, 
+                                      uint32_t width, uint32_t height,
                                       double ratio, int format, int flags) {
   caca_driver_t *this = (caca_driver_t*) this_gen;
   caca_frame_t  *frame = (caca_frame_t *) img;
 
-  if ((frame->width != width) || (frame->height != height) 
+  if ((frame->width != width) || (frame->height != height)
       || (frame->format != format)) {
 
     av_freep (&frame->vo_frame.base[0]);
@@ -214,7 +214,7 @@
 
 static int caca_get_property (vo_driver_t *this_gen, int property) {
   caca_driver_t *this = (caca_driver_t*) this_gen;
-  
+
   if ( property == VO_PROP_ASPECT_RATIO) {
     return this->user_ratio;
   } else {
@@ -225,7 +225,7 @@
   return 0;
 }
 
-static int caca_set_property (vo_driver_t *this_gen, 
+static int caca_set_property (vo_driver_t *this_gen,
                               int property, int value) {
   caca_driver_t *this = (caca_driver_t*) this_gen;
 
@@ -242,7 +242,7 @@
   return value;
 }
 
-static void caca_get_property_min_max (vo_driver_t *this_gen, 
+static void caca_get_property_min_max (vo_driver_t *this_gen,
                                        int property, int *min, int *max) {
   *min = 0;
   *max = 0;
@@ -266,7 +266,7 @@
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
-  
+
   this->config = class->config;
   this->xine   = class->xine;
 
@@ -297,18 +297,18 @@
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;
-}    
+}
 
 static void *init_class (xine_t *xine, void *visual_gen) {
   caca_class_t    *this;
-  
+
   this = calloc(1, sizeof(caca_class_t));
-  
+
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.identifier      = "CACA";
   this->driver_class.description     = N_("xine video output plugin using the Color AsCii Art library");
   this->driver_class.dispose         = default_video_driver_class_dispose;
-  
+
   this->config            = xine->config;
   this->xine              = xine;
 
@@ -321,7 +321,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2006 the xine project and Claudio Ciccani
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +19,7 @@
  *
  *
  * DirectFB based output plugin by Claudio Ciccani <klan@...>
- * 
+ *
  * Based on video_out_xv.c and video_out_vidix.c.
  */
 
@@ -71,18 +71,18 @@
 
 typedef struct directfb_driver_s {
   vo_driver_t                  vo_driver;
-  
+
   int                          visual_type;
   uint32_t                     capabilities;
 
   xine_t                      *xine;
-  
+
   directfb_frame_t            *cur_frame;
 
   /* DirectFB related stuff */
   IDirectFB                   *dfb;
   IDirectFBDisplayLayer       *underlay;
-  
+
   /* Video Layer */
   IDirectFBDisplayLayer       *layer;
   IDirectFBSurface            *surface;
@@ -93,23 +93,23 @@
   DFBColorAdjustment           default_cadj;
   int                          default_level;
   int                          visible;
-  
+
   /* Subpicture layer */
   IDirectFBDisplayLayer       *spic_layer;
   IDirectFBSurface            *spic_surface;
-  
+
   /* for hardware scaling */
   IDirectFBSurface            *temp;
   int                          temp_frame_width;
   int                          temp_frame_height;
   DFBSurfacePixelFormat        temp_frame_format;
-  
+
   /* wheter card supports stretchblit with deinterlacing */
   int                          hw_deinterlace;
-  
+
   /* wheter to enable deinterlacing */
   int                          deinterlace;
-  
+
   /* configurable options */
   int                          buffermode;
   int                          vsync;
@@ -117,7 +117,7 @@
   uint32_t                     colorkey;
   int                          flicker_filtering;
   int                          field_parity;
-  
+
 #ifdef DIRECTFB_X11
   /* X11 related stuff */
   Display                     *display;
@@ -126,18 +126,18 @@
   GC                           gc;
   int                          depth;
   x11osd                      *xoverlay;
-  
+
   void                        *user_data;
   void                       (*lock_display) (void *user_data);
   void                       (*unlock_display) (void *user_data);
 #endif
 
   int                          ovl_changed;
-  
+
   /* screen size */
   int                          screen_width;
   int                          screen_height;
-  
+
   /* size / aspect ratio calculations */
   vo_scale_t                   sc;
 
@@ -162,7 +162,7 @@
                           "no-deinit-check,"\
                           "disable-module=linux_input,"\
                           "disable-module=keyboard"
-                         
+
 #define XDIRECTFB_OPTIONS "no-banner,"\
                           "no-sighandler,"\
                           "no-deinit-check"
@@ -189,7 +189,7 @@
     else \
       XLockDisplay (this->display); \
   } while (0)
-  
+
 #define UNLOCK_DISPLAY() \
   do { \
[... 1694 lines omitted ...]
   /* retrieve an interface to the current screen */
   ret = this->dfb->GetScreen (this->dfb, DSCID_PRIMARY, &screen);
   if (ret != DFB_OK) {
@@ -1967,7 +1967,7 @@
     free (this);
     return NULL;
   }
-  
+
   /* find an overlay layer on the current screen */
   ret = screen->EnumDisplayLayers (screen, find_overlay, (void*)&id);
   screen->Release (screen);
@@ -1977,7 +1977,7 @@
     free (this);
     return NULL;
   }
-  
+
   if (id != DLID_PRIMARY) {
     DFBDisplayLayerDescription dsc;
     /* get overlay access */
@@ -1998,7 +1998,7 @@
       this->layer = NULL;
     }
   }
-  
+
   if (!this->layer) {
     xprintf (this->xine, XINE_VERBOSITY_LOG,
              _("video_out_directfb: no usable display layer was found!\n"));
@@ -2006,10 +2006,10 @@
     free (this);
     return NULL;
   }
-  
+
   xprintf (this->xine, XINE_VERBOSITY_LOG,
           _("video_out_directfb: using display layer #%d.\n"), id);
-  
+
   this->capabilities      = convert_caps (this->caps);
   /* set default configuration */
   this->buffermode        = 1; // double
@@ -2018,7 +2018,7 @@
   this->colorkey          = DEFAULT_COLORKEY;
   this->flicker_filtering = 0;
   this->field_parity      = 0;
-  
+
   /* get user configuration */
   init_config (this);
 
@@ -2029,42 +2029,42 @@
     free (this);
     return NULL;
   }
-  
+
   this->display  = visual->display;
   this->screen   = visual->screen;
   this->drawable = visual->d;
   this->gc       = XCreateGC (this->display, this->drawable, 0, NULL);
-  
+
   XGetWindowAttributes (this->display, this->drawable, &attrs);
   this->depth = attrs.depth;
 
   _x_alphablend_init (&this->alphablend_extra_data, this->xine);
-  
+
   _x_vo_scale_init (&this->sc, 1, 0, this->xine->config);
   this->sc.user_ratio      = XINE_VO_ASPECT_AUTO;
   this->sc.gui_width       = attrs.width;
   this->sc.gui_height      = attrs.height;
   this->sc.frame_output_cb = visual->frame_output_cb;
   this->sc.user_data       = visual->user_data;
-  
+
   if (this->visual_type == XINE_VISUAL_TYPE_X11_2) {
     this->user_data      = visual->user_data;
     this->lock_display   = visual->lock_display;
     this->unlock_display = visual->unlock_display;
-  }    
-  
+  }
+
   if (this->colorkeying) {
     this->xoverlay = x11osd_create (this->xine, this->display, this->screen,
                                     this->drawable, X11OSD_COLORKEY);
     if (this->xoverlay) {
-      x11osd_colorkey (this->xoverlay, 
+      x11osd_colorkey (this->xoverlay,
                        directfb_colorkey_to_pixel(this), &this->sc);
     }
   } else {
     this->xoverlay = x11osd_create (this->xine, this->display, this->screen,
                                     this->drawable, X11OSD_SHAPED);
   }
-  
+
   if (this->xoverlay)
     this->capabilities |= VO_CAP_UNSCALED_OVERLAY;
 
@@ -2099,13 +2099,13 @@
              "video_out_directfb: %s!\n", error);
     return NULL;
   }
-  
+
   if (!visual) {
     xprintf (xine, XINE_VERBOSITY_DEBUG,
              "video_out_directfb: x11 visual is required!\n");
     return NULL;
   }
-  
+
   /* check if we are running under XDirectFB */
   if (strcmp (XServerVendor (visual->display), "Denis Oliver Kropp"))
     return NULL;
@@ -2128,7 +2128,7 @@
   this = init_class_x11( xine, visual_gen );
   if (this)
     this->visual_type = XINE_VISUAL_TYPE_X11_2;
-    
+
   return this;
 }
 

diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2005 the xine project
- * 
+ *
  * This file is part of xine, a unix video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -118,7 +118,7 @@
 
   LPDIRECTDRAW		   ddobj;	    /* direct draw object */
   LPDIRECTDRAWSURFACE	   primary;	    /* primary dd surface */
-  LPDIRECTDRAWSURFACE 	   secondary;	    /* secondary dd surface  */
+  LPDIRECTDRAWSURFACE	   secondary;	    /* secondary dd surface  */
   LPDIRECTDRAWCLIPPER	   ddclipper;	    /* dd clipper object */
   uint8_t *		   contents;	    /* secondary contents */
   win32_frame_t           *current;         /* current frame */
@@ -151,7 +151,7 @@
  *
  * ----------------------------------------- */
 
-/* Display formatted error message in 
+/* Display formatted error message in
  * popup message box.*/
 
 static void Error( HWND hwnd, LPSTR szfmt, ... )
@@ -169,7 +169,7 @@
 {
   if( win32_visual->FullScreen )
     {
-      SetRect( &win32_visual->WndRect, 0, 0, 
+      SetRect( &win32_visual->WndRect, 0, 0,
 	       GetSystemMetrics( SM_CXSCREEN ),
 	       GetSystemMetrics( SM_CYSCREEN ) );
     }
@@ -181,12 +181,12 @@
     }
 }
 
-/* Create our direct draw object, primary 
+/* Create our direct draw object, primary
  * surface and clipper object.
  *
- * NOTE : The primary surface is more or 
+ * NOTE : The primary surface is more or
  * less a viewport into the parent desktop
- * window and will always have a pixel format 
+ * window and will always have a pixel format
  * identical to the current display mode. */
 
 static boolean CreatePrimary( win32_driver_t * win32_driver )
@@ -276,7 +276,7 @@
 }
 
 /* Create our secondary ( off screen ) buffer.
- * The optimal secondary buffer is a h/w 
+ * The optimal secondary buffer is a h/w
  * overlay with the same pixel format as the
  * xine frame type. However, since this is
  * not always supported by the host h/w,
@@ -327,7 +327,7 @@
       /* the requested format is XINE_IMGFMT_YV12 */
 
       ddsd.dwFlags                       = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY; 
+      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY;
       ddsd.ddpfPixelFormat.dwSize        = sizeof(DDPIXELFORMAT);
       ddsd.ddpfPixelFormat.dwFlags       = DDPF_FOURCC;
       ddsd.ddpfPixelFormat.dwYUVBitCount = 16;
@@ -343,7 +343,7 @@
       /* the requested format is XINE_IMGFMT_YUY2 */
 
       ddsd.dwFlags                       = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY; 
+      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY;
       ddsd.ddpfPixelFormat.dwSize        = sizeof(DDPIXELFORMAT);
       ddsd.ddpfPixelFormat.dwFlags       = DDPF_FOURCC;
       ddsd.ddpfPixelFormat.dwYUVBitCount = 16;
@@ -360,7 +360,7 @@
       /* the requested format is IMGFMT_RGB */
 
       ddsd.dwFlags                       = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY; 
+      ddsd.ddsCaps.dwCaps                = DDSCAPS_VIDEOMEMORY | DDSCAPS_OVERLAY;
       ddsd.ddpfPixelFormat.dwSize        = sizeof(DDPIXELFORMAT);
       ddsd.ddpfPixelFormat.dwFlags       = DDPF_RGB;
       ddsd.ddpfPixelFormat.dwYUVBitCount = 24;
@@ -371,7 +371,7 @@
       lprintf("CreateSecondary() - act_format = (RGB) %d\n", IMGFMT_RGB);
 
       win32_driver->act_format = IMGFMT_RGB;
-    } 
+    }
 #endif /* RGB_SUPPORT */
 
   lprintf("CreateSecondary() - IDirectDraw_CreateSurface()\n");
@@ -423,7 +423,7 @@
     IDirectDraw_Release( win32_driver->ddobj );
 
   _x_alphablend_free(&win32_driver->alphablend_extra_data);
-  
+
   free( win32_driver );
 }
 
@@ -447,7 +447,7 @@
       Error( 0, "IDirectDrawSurface_GetPixelFormat ( CheckPixelFormat ) : error 0x%lx", result );
       return 0;
     }
[... 32 lines omitted ...]
@@ -583,7 +583,7 @@
 {
   DWORD			dw_color_key;
   DDPIXELFORMAT		ddpf;
-  DDOVERLAYFX		ddofx;	
+  DDOVERLAYFX		ddofx;
   int			flags;
   HRESULT		result;
 
@@ -903,7 +903,7 @@
 }
 
 
-static void win32_update_frame_format( vo_driver_t * vo_driver, vo_frame_t * vo_frame, uint32_t width, 
+static void win32_update_frame_format( vo_driver_t * vo_driver, vo_frame_t * vo_frame, uint32_t width,
 				       uint32_t height, double ratio, int format, int flags )
 {
   win32_driver_t  *win32_driver = ( win32_driver_t * ) vo_driver;
@@ -953,7 +953,7 @@
 #endif
       else
 	{
-	  xprintf (win32_driver->xine, XINE_VERBOSITY_DEBUG, 
+	  xprintf (win32_driver->xine, XINE_VERBOSITY_DEBUG,
 		   "vo_out_directx : !!! unsupported image format %04x !!!\n", format );
 	  exit (1);
 	}
@@ -1015,13 +1015,13 @@
 #if NEW_YUV
 	  win32_driver->yuv2rgb->configure( win32_driver->yuv2rgb,
 					    win32_driver->width, win32_driver->height,
-				 	    win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[1],
+					    win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[1],
 					    win32_driver->width, win32_driver->height,
 					    win32_driver->width * win32_driver->bytespp);
 #else
 	  yuv2rgb_setup( win32_driver->yuv2rgb,
 			 win32_driver->width, win32_driver->height,
-		 	 win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[1],
+			 win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[1],
 			 win32_driver->width, win32_driver->height,
 			 win32_driver->width * win32_driver->bytespp );
 
@@ -1041,7 +1041,7 @@
 #if NEW_YUV
 	  win32_driver->yuv2rgb->configure( win32_driver->yuv2rgb,
 					    win32_driver->width, win32_driver->height,
-				 	    win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[0] / 2,
+					    win32_frame->vo_frame.pitches[0], win32_frame->vo_frame.pitches[0] / 2,
 					    win32_driver->width, win32_driver->height,
 					    win32_driver->width * win32_driver->bytespp );
 #else
@@ -1087,14 +1087,14 @@
           src += vo_frame->pitches[0];
           dst += win32_driver->ddsd.lPitch;
         }
-        
+
         src = frame->base[2];
         for (line = 0; line < frame->height/2 ; line++){
           xine_fast_memcpy( dst, src, frame->width/2);
           src += vo_frame->pitches[2];
           dst += win32_driver->ddsd.lPitch/2;
         }
-        
+
         src = frame->base[1];
         for (line = 0; line < frame->height/2 ; line++){
           xine_fast_memcpy( dst, src, frame->width/2);
@@ -1102,10 +1102,10 @@
           dst += win32_driver->ddsd.lPitch/2;
         }
 	  break;
-	  
+
 	case XINE_IMGFMT_YUY2:
 	default:
-      src = frame->base[0];	
+      src = frame->base[0];
       for (line = 0; line < frame->height ; line++){
 	    xine_fast_memcpy( dst, src, frame->width*2);
 	    src += vo_frame->pitches[0];
@@ -1184,7 +1184,7 @@
     {
       HRESULT result;
       HWND newWndHnd = (HWND) data;
-	  
+
 	  /* set cooperative level */
 	  result = IDirectDraw_SetCooperativeLevel( win32_driver->ddobj, newWndHnd, DDSCL_NORMAL );
       if( result != DD_OK )
@@ -1217,15 +1217,15 @@
   int ret = 0;
 
   /* TC - May need to revisit this! */
-#ifdef TC  
+#ifdef TC
   win32_driver_t  *win32_driver = (win32_driver_t *) this_gen;
 
   if( _x_vo_scale_redraw_needed( &win32_driver->sc ) ) {
-    win32_gui_data_exchange(this_gen, GUI_WIN32_MOVED_OR_RESIZED, 0);    
+    win32_gui_data_exchange(this_gen, GUI_WIN32_MOVED_OR_RESIZED, 0);
     ret = 1;
   }
 #endif
-  
+
   return ret;
 }
 
@@ -1246,7 +1246,7 @@
 
 
   _x_alphablend_init(&win32_driver->alphablend_extra_data, class->xine);
-  
+
   win32_driver->xine = class->xine;
 
   /* Make sure that the DirectX drivers are available and present! */
@@ -1302,7 +1302,7 @@
 
   directx->xine                         = xine;
   directx->config                       = xine->config;
-  
+
   return directx;
 }
 

diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2007 the xine project and Fredrik Noring
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -27,7 +27,7 @@
  * @author Fredrik Noring <noring@...>:
  *         Zero copy buffers and clean up.
  *
- * @author Aaron Holtzman <aholtzma@...>: 
+ * @author Aaron Holtzman <aholtzma@...>:
  *         Based on xine's video_out_xshm.c, based on mpeg2dec code from
  *
  * @author Geert Uytterhoeven and Chris Lawrence:
@@ -52,8 +52,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h> 
-             
+#include <fcntl.h>
+
 #include "xine.h"
 #include <xine/video_out.h>
 
@@ -95,13 +95,13 @@
 
   int                format;
   int                flags;
-  
+
   vo_scale_t         sc;
 
   yuv2rgb_t         *yuv2rgb;  /* yuv2rgb converter for this frame */
   uint8_t           *rgb_dst;
   int                yuv_stride;
-  
+
   int                bytes_per_line;
 
   uint8_t*           video_mem;            /* mmapped video memory */
@@ -118,12 +118,12 @@
   int                fd;
   int                mem_size;
   uint8_t*           video_mem_base;       /* mmapped video memory */
-  
+
   int                depth, bpp, bytes_per_pixel;
-  
+
   int                total_num_native_buffers;
   int                used_num_buffers;
-	
+
   int                yuv2rgb_mode;
   int                yuv2rgb_swap;
   int                yuv2rgb_brightness;
@@ -136,11 +136,11 @@
 
   /* size / aspect ratio calculations */
   vo_scale_t         sc;
-  
+
   int                fb_bytes_per_line;
 
   fb_frame_t        *cur_frame, *old_frame;
-	
+
   struct fb_var_screeninfo fb_var;
   struct fb_fix_screeninfo fb_fix;
 
@@ -165,10 +165,10 @@
 static void fb_frame_proc_slice(vo_frame_t *vo_img, uint8_t **src)
 {
   fb_frame_t *frame = (fb_frame_t *)vo_img ;
-  
+
   vo_img->proc_called = 1;
- 
-  if( frame->vo_frame.crop_left || frame->vo_frame.crop_top || 
+
+  if( frame->vo_frame.crop_left || frame->vo_frame.crop_top ||
       frame->vo_frame.crop_right || frame->vo_frame.crop_bottom )
   {
     /* we don't support crop, so don't even waste cpu cycles.
@@ -188,18 +188,18 @@
 static void fb_frame_field(vo_frame_t *vo_img, int which_field)
 {
   fb_frame_t *frame = (fb_frame_t *)vo_img ;
-  
+
   switch(which_field)
   {
   case VO_TOP_FIELD:
       frame->rgb_dst    = frame->data;
     break;
-			
+
   case VO_BOTTOM_FIELD:
       frame->rgb_dst    = frame->data +
 			  frame->bytes_per_line ;
     break;
-			
+
   case VO_BOTH_FIELDS:
       frame->rgb_dst    = frame->data;
     break;
@@ -232,16 +232,16 @@
   memcpy(&frame->sc, &this->sc, sizeof(vo_scale_t));
 
   pthread_mutex_init(&frame->vo_frame.mutex, NULL);
-  
+
[... 296 lines omitted ...]
 	case 8:
 	  if(!var->blue.offset)
-	    return MODE_8_RGB; 
-	  return MODE_8_BGR; 
+	    return MODE_8_RGB;
+	  return MODE_8_BGR;
 
       }
   }
-  
+
   xprintf(this->xine, XINE_VERBOSITY_LOG, _("%s: Your video mode was not recognized, sorry.\n"), LOG_MODULE);
   return 0;
 }
-    
+
 static int setup_yuv2rgb(fb_driver_t *this, config_values_t *config,
 			 struct fb_var_screeninfo *var,
 			 struct fb_fix_screeninfo *fix)
@@ -890,13 +890,13 @@
   this->yuv2rgb_contrast   = this->yuv2rgb_saturation = 128;
 
   this->yuv2rgb_factory = yuv2rgb_factory_init(this->yuv2rgb_mode,
-					       this->yuv2rgb_swap, 
+					       this->yuv2rgb_swap,
 					       this->yuv2rgb_cmap);
   this->yuv2rgb_factory->set_csc_levels (this->yuv2rgb_factory,
                                          this->yuv2rgb_brightness,
                                          this->yuv2rgb_contrast,
                                          this->yuv2rgb_saturation);
-  
+
   return 1;
 }
 
@@ -917,7 +917,7 @@
    *                 bpp      <= 32
    *                 msb_right = 0
    */
-   
+
   this->bytes_per_pixel = (this->fb_var.bits_per_pixel + 7)/8;
   this->bpp = this->bytes_per_pixel * 8;
   this->depth = this->fb_var.red.length +
@@ -926,9 +926,9 @@
 
   this->total_num_native_buffers = var->yres_virtual / var->yres;
   this->used_num_buffers = 0;
-	
+
   this->cur_frame = this->old_frame = 0;
-	
+
   xprintf(this->xine, XINE_VERBOSITY_LOG,
 	  _("%s: %d video RAM buffers are available.\n"), LOG_MODULE, this->total_num_native_buffers);
 
@@ -938,7 +938,7 @@
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("WARNING: %s: Zero copy buffers are DISABLED because only %d buffers\n"
 	      "     are available which is less than the recommended %d buffers. Lowering\n"
-	      "     the frame buffer resolution might help.\n"), 
+	      "     the frame buffer resolution might help.\n"),
 	    LOG_MODULE, this->total_num_native_buffers, RECOMMENDED_NUM_BUFFERS);
   }
   else
@@ -966,11 +966,11 @@
   fb_driver_t *this;
   fb_class_t *class;
   fb_visual_t *visual = NULL;
-  
+
   if (visual_gen) {
     visual = (fb_visual_t *) visual_gen;
   }
-          
+
   class = (fb_class_t *)class_gen;
   config = class->config;
 
@@ -980,7 +980,7 @@
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   register_callbacks(this);
 
   this->fd = open_fb_device(config, class->xine);
@@ -992,7 +992,7 @@
     goto error;
   if (!set_fb_palette (this->fd, &this->fb_var))
     goto error;
-   
+
   this->xine = class->xine;
 
   if(this->fb_fix.line_length)
@@ -1001,7 +1001,7 @@
     this->fb_bytes_per_line =
       (this->fb_var.xres_virtual *
        this->fb_var.bits_per_pixel)/8;
-    
+
   _x_vo_scale_init(&this->sc, 0, 0, config);
   this->sc.gui_width  = this->fb_var.xres;
   this->sc.gui_height = this->fb_var.yres;
@@ -1027,10 +1027,10 @@
 	  this->fb_var.red.length, this->fb_var.red.offset,
 	  this->fb_var.green.length, this->fb_var.green.offset,
 	  this->fb_var.blue.length, this->fb_var.blue.offset);
-  
+
   if(!setup_yuv2rgb(this, config, &this->fb_var, &this->fb_fix))
     goto error;
-	
+
   /* mmap whole video memory */
   this->mem_size = this->fb_fix.smem_len;
   this->video_mem_base = mmap(0, this->mem_size, PROT_READ | PROT_WRITE,
@@ -1064,7 +1064,7 @@
 
 /* exported plugin catalog entry */
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.c
@@ -72,7 +72,7 @@
 
 static void none_frame_dispose(vo_frame_t *vo_frame) {
   none_frame_t *frame = (none_frame_t *)vo_frame;
-  free_framedata(frame);  
+  free_framedata(frame);
   free (frame);
 }
 
@@ -87,7 +87,7 @@
 static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) {
   /* none_driver_t *this = (none_driver_t *) vo_driver; */
   none_frame_t  *frame;
-  
+
   frame = calloc(1, sizeof(none_frame_t));
   if(!frame)
     return NULL;
@@ -97,43 +97,43 @@
   frame->vo_frame.base[0] = NULL;
   frame->vo_frame.base[1] = NULL;
   frame->vo_frame.base[2] = NULL;
-  
+
   frame->vo_frame.proc_slice = NULL;
   frame->vo_frame.proc_frame = NULL;
   frame->vo_frame.field      = none_frame_field;
   frame->vo_frame.dispose    = none_frame_dispose;
   frame->vo_frame.driver     = vo_driver;
-  
+
   return (vo_frame_t *)frame;
 }
 
 static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_frame,
-				     uint32_t width, uint32_t height, 
+				     uint32_t width, uint32_t height,
 				     double ratio, int format, int flags) {
   none_driver_t *this = (none_driver_t *) vo_driver;
   none_frame_t  *frame = (none_frame_t *) vo_frame;
 
   if((frame->width != width) || (frame->height != height) || (frame->format != format)) {
-    
+
     free_framedata(frame);
-    
+
     frame->width  = width;
     frame->height = height;
     frame->format = format;
-    
+
     switch(format) {
 
-    case XINE_IMGFMT_YV12: 
+    case XINE_IMGFMT_YV12:
       {
 	int y_size, uv_size;
-	
+
 	frame->vo_frame.pitches[0] = 8*((width + 7) / 8);
 	frame->vo_frame.pitches[1] = 8*((width + 15) / 16);
 	frame->vo_frame.pitches[2] = 8*((width + 15) / 16);
-	
+
 	y_size  = frame->vo_frame.pitches[0] * height;
 	uv_size = frame->vo_frame.pitches[1] * ((height+1)/2);
-	
+
 	frame->vo_frame.base[0] = malloc (y_size + 2*uv_size);
 	frame->vo_frame.base[1] = frame->vo_frame.base[0]+y_size+uv_size;
 	frame->vo_frame.base[2] = frame->vo_frame.base[0]+y_size;
@@ -152,14 +152,14 @@
       break;
 
     }
-    
-    if((format == XINE_IMGFMT_YV12 
-	&& (frame->vo_frame.base[0] == NULL 
-	    || frame->vo_frame.base[1] == NULL 
+
+    if((format == XINE_IMGFMT_YV12
+	&& (frame->vo_frame.base[0] == NULL
+	    || frame->vo_frame.base[1] == NULL
 	    || frame->vo_frame.base[2] == NULL))
        || (format == XINE_IMGFMT_YUY2 && frame->vo_frame.base[0] == NULL)) {
       xprintf (this->xine, XINE_VERBOSITY_DEBUG,
-	       "video_out_none: error. (framedata allocation failed: out of memory)\n"); 
+	       "video_out_none: error. (framedata allocation failed: out of memory)\n");
       free_framedata(frame);
     }
   }
@@ -170,19 +170,19 @@
 static void none_display_frame(vo_driver_t *vo_driver, vo_frame_t *vo_frame) {
   /* none_driver_t  *driver = (none_driver_t *)vo_driver; */
   none_frame_t   *frame = (none_frame_t *)vo_frame;
-  
+
   frame->vo_frame.free(&frame->vo_frame);
 }
 
 static int none_get_property(vo_driver_t *vo_driver, int property) {
   none_driver_t  *driver = (none_driver_t *)vo_driver;
-  
+
   switch(property) {
 
   case VO_PROP_ASPECT_RATIO:
     return driver->ratio;
     break;
-    
+
   default:
     break;
   }
@@ -192,7 +192,7 @@
 
 static int none_set_property(vo_driver_t *vo_driver, int property, int value) {
   none_driver_t  *driver = (none_driver_t *)vo_driver;
-  
+
   switch(property) {
 
   case VO_PROP_ASPECT_RATIO:
@@ -208,7 +208,7 @@
   return value;
 }
 
-static void none_get_property_min_max(vo_driver_t *vo_driver, 
+static void none_get_property_min_max(vo_driver_t *vo_driver,
 				      int property, int *min, int *max) {
   *min = 0;
   *max = 0;
@@ -242,13 +242,13 @@
 static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *visual) {
   none_class_t    *class = (none_class_t *) driver_class;
   none_driver_t   *driver;
-  
+
   driver = calloc(1, sizeof(none_driver_t));
-  
+
   driver->config = class->config;
   driver->xine   = class->xine;
   driver->ratio  = XINE_VO_ASPECT_AUTO;
-  
+
   driver->vo_driver.get_capabilities     = none_get_capabilities;
   driver->vo_driver.alloc_frame          = none_alloc_frame ;
   driver->vo_driver.update_frame_format  = none_update_frame_format;
@@ -262,16 +262,16 @@
   driver->vo_driver.gui_data_exchange    = none_gui_data_exchange;
   driver->vo_driver.dispose              = none_dispose;
   driver->vo_driver.redraw_needed        = none_redraw_needed;
-  
+
   return &driver->vo_driver;
-}    
+}
 
 /*
  * Class related functions.
  */
 static void *init_class (xine_t *xine, void *visual) {
   none_class_t        *this;
-  
+
   this = calloc(1, sizeof(none_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
@@ -291,7 +291,7 @@
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "none", XINE_VERSION_CODE, &vo_info_none, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2003 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -147,7 +147,7 @@
   double             ratio;
 
   uint8_t           *rgb, *rgb_dst;
-    
+
   yuv2rgb_t         *yuv2rgb; /* yuv2rgb converter set up for this frame */
 
 } opengl_frame_t;
@@ -203,7 +203,7 @@
   PFNMYGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
   PFNMYGLGENTEXTURESEXTPROC          glGenTexturesEXT;
   PFNMYGLBINDTEXTUREEXTPROC          glBindTextureEXT;
-  
+
   int                yuv2rgb_brightness;
   int                yuv2rgb_contrast;
   int                yuv2rgb_saturation;
@@ -238,7 +238,7 @@
     int (*setup)(opengl_driver_t *);
     /* Flag: needs output converted to rgb (is able to do YUV otherwise) */
     int needsrgb;
-    /* Default action: what to do if there's no new image 
+    /* Default action: what to do if there's no new image
      * typically either RENDER_NONE or RENDER_DRAW (for animated render's) */
     enum render_e defaction;
     /* Fallback: change to following render backend if this one doesn't work */
@@ -332,7 +332,7 @@
   float           off;
   float           tx, ty;
   struct timeval  curtime;
-  
+
   glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
   /* Calc timing + texture coords */
@@ -346,10 +346,10 @@
   glMatrixMode   (GL_MODELVIEW);
   glLoadIdentity ();
   glTranslatef   (0, 0, -10);
-  glRotatef      (off * CYCLE_FACTOR1, 1, 0, 0);  
-  glRotatef      (off,                 0, 0, 1); 
-  glRotatef      (off * CYCLE_FACTOR2, 0, 1, 0);  
- 
+  glRotatef      (off * CYCLE_FACTOR1, 1, 0, 0);
+  glRotatef      (off,                 0, 0, 1);
+  glRotatef      (off * CYCLE_FACTOR2, 0, 1, 0);
+
   /* Note that this is not aspect ratio corrected */
   glBegin (GL_QUADS);
   for (i = 0; i < CYL_TESSELATION; i++) {
@@ -368,7 +368,7 @@
 }
 
 /* Animated spinning environment mapped torus */
-#define DIST_FACTOR   16.568542  	/* 2 * (sqrt(2)-1) * 20 */
+#define DIST_FACTOR   16.568542	/* 2 * (sqrt(2)-1) * 20 */
 static void render_env_tor (opengl_driver_t *this, opengl_frame_t *frame) {
   float           off;
   float           x1, y1, x2, y2, tx, ty;
@@ -402,7 +402,7 @@
   glLoadIdentity ();
   glDepthFunc    (GL_ALWAYS);
   glDepthMask    (GL_FALSE);
-  
+
   glBegin        (GL_QUADS);
   glColor3f      (1, 1, 1);
   glTexCoord2f   (tx, 0);     glVertex3f   (x2, y2, -20);
@@ -410,7 +410,7 @@
   glTexCoord2f   (0,  ty);    glVertex3f   (x1, y1, -20);
   glTexCoord2f   (tx, ty);    glVertex3f   (x2, y1, -20);
   glEnd          ();
-  
+
   glPopMatrix    ();
   glDepthFunc    (GL_LEQUAL);
   glDepthMask    (GL_TRUE);
@@ -447,7 +447,7 @@
       tex_w <<= 1;
     while (tex_h < new_h)
       tex_h <<= 1;
-    
+
     if (tex_w != this->tex_width || tex_h != this->tex_height) {
       char *tmp = calloc (tex_w * tex_h, 4); /* 4 enough until RGBA */
       if (this->glBindTextureEXT)
@@ -463,7 +463,7 @@
       this->tex_width  = tex_w;
       this->tex_height = tex_h;
       lprintf ("* new texsize: %dx%d\n", tex_w, tex_h);
-    }	
+    }
     this->last_width  = new_w;
     this->last_height = new_h;
     return 1;
@@ -486,7 +486,7 @@
       tex_w <<= 1;
     while (tex_h < new_h)
       tex_h <<= 1;
-    
+
     if (tex_w != this->tex_width || tex_h != this->tex_height) {
       char *tmp = calloc (tex_w * tex_h, 4); /* 4 enough until RGBA */
       if (this->glBindTextureEXT)
@@ -526,7 +526,7 @@
       this->tex_width  = tex_w;
       this->tex_height = tex_h;
[... 236 lines omitted ...]
 	     "video_out_opengl: tried to set unsupported property %d\n", property);
   }
 
@@ -1664,7 +1664,7 @@
   }
 }
 
-static int opengl_gui_data_exchange (vo_driver_t *this_gen, 
+static int opengl_gui_data_exchange (vo_driver_t *this_gen,
 				   int data_type, void *data) {
   opengl_driver_t   *this = (opengl_driver_t *) this_gen;
 
@@ -1679,7 +1679,7 @@
     /*     lprintf ("expose event\n"); */
     if (this->frame[0]) {
       XExposeEvent * xev = (XExposeEvent *) data;
-      
+
       if (xev && xev->count == 0) {
 	pthread_mutex_lock (&this->render_action_mutex);
 	if (this->render_action <= RENDER_CLEAN) {
@@ -1716,9 +1716,9 @@
 			  &this->render_action_mutex);
     pthread_mutex_unlock (&this->render_action_mutex);
     break;
-    
+
   case XINE_GUI_SEND_DRAWABLE_CHANGED:
-    
+
     pthread_mutex_lock   (&this->render_action_mutex);
     this->render_action = RENDER_RELEASE;
     pthread_cond_signal  (&this->render_action_cond);
@@ -1746,7 +1746,7 @@
     if (this->frame[0]) {
       x11_rectangle_t *rect = data;
       int              x1, y1, x2, y2;
-      
+
       _x_vo_scale_translate_gui2video(&this->sc,
 			       rect->x, rect->y,
 			       &x1, &y1);
@@ -1775,7 +1775,7 @@
   this->render_action = RENDER_EXIT;
   pthread_cond_signal   (&this->render_action_cond);
   pthread_mutex_unlock  (&this->render_action_mutex);
-  pthread_join          (this->render_thread, NULL);  
+  pthread_join          (this->render_thread, NULL);
   pthread_mutex_destroy (&this->render_action_mutex);
   pthread_cond_destroy  (&this->render_action_cond);
   pthread_cond_destroy  (&this->render_return_cond);
@@ -1793,7 +1793,7 @@
   }
 
   _x_alphablend_free(&this->alphablend_extra_data);
-    
+
   free (this);
 }
 
@@ -1820,7 +1820,7 @@
   opengl_driver_t      *this;
   char                **render_fun_names;
   int                   i;
-  
+
   this = (opengl_driver_t *) calloc(1, sizeof(opengl_driver_t));
 
   if (!this)
@@ -1834,9 +1834,9 @@
   this->sc.dest_size_cb     = visual->dest_size_cb;
   this->sc.user_data        = visual->user_data;
   this->sc.user_ratio       = XINE_VO_ASPECT_AUTO;
-  
+
   _x_alphablend_init (&this->alphablend_extra_data, class->xine);
-  
+
   this->drawable	    = visual->d;
   this->gui_width  = this->gui_height  = -1;
   this->last_width = this->last_height = -1;
@@ -1846,7 +1846,7 @@
   this->ovl_changed             = 0;
   this->xine                    = class->xine;
   this->config                  = config;
-  
+
   this->vo_driver.get_capabilities     = opengl_get_capabilities;
   this->vo_driver.alloc_frame          = opengl_alloc_frame;
   this->vo_driver.update_frame_format  = opengl_update_frame_format;
@@ -1864,8 +1864,8 @@
   this->yuv2rgb_brightness = 0;
   this->yuv2rgb_contrast   = 128;
   this->yuv2rgb_saturation = 128;
-  
-  this->yuv2rgb_factory = yuv2rgb_factory_init (YUV_FORMAT, YUV_SWAP_MODE, 
+
+  this->yuv2rgb_factory = yuv2rgb_factory_init (YUV_FORMAT, YUV_SWAP_MODE,
 						NULL);
   this->yuv2rgb_factory->set_csc_levels (this->yuv2rgb_factory,
 					 this->yuv2rgb_brightness,
@@ -1917,7 +1917,7 @@
 							"it also reduces flickering a lot.\n"
 							"It should not have any performance impact."),
 						      20, NULL, NULL);
-  
+
   pthread_mutex_init (&this->render_action_mutex, NULL);
   pthread_cond_init  (&this->render_action_cond, NULL);
   pthread_cond_init  (&this->render_return_cond, NULL);
@@ -1947,7 +1947,7 @@
     xprintf (this->xine, XINE_VERBOSITY_LOG,
 	     "video_out_opengl: default visual not OpenGL capable\n"
 	     "   plugin will only work with clients supporting XINE_GUI_SEND_SELECT_VISUAL.\n");
-    
+
   return &this->vo_driver;
 }
 
@@ -2036,7 +2036,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c
--- a/src/video_out/video_out_pgx32.c
+++ b/src/video_out/video_out_pgx32.c
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -149,7 +149,7 @@
   double ratio;
 } pgx32_frame_t;
 
-typedef struct {   
+typedef struct {
   vo_driver_t vo_driver;
   vo_scale_t vo_scale;
 
@@ -210,7 +210,7 @@
     }
 
     if (strcmp("TSIgfxp", ident.name) != 0) {
-      xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"), devname);    
+      xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"), devname);
       XDgaUnGrabDrawable(this->dgadraw);
       XUnlockDisplay(this->display);
       return 0;
@@ -485,7 +485,7 @@
     _x_vo_scale_compute_ideal_size(&this->vo_scale);
   }
 
-  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {  
+  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {
     int i;
 
     _x_vo_scale_compute_output_size(&this->vo_scale);
@@ -589,7 +589,7 @@
 {
   /*pgx32_driver_t *this = (pgx32_driver_t *)(void *)this_gen;*/
   pgx32_frame_t *frame = (pgx32_frame_t *)frame_gen;
-  
+
   if (overlay->rle) {
     int i, j, x, y, len, width;
     int use_clip_palette;
@@ -757,7 +757,7 @@
 {
   pgx32_driver_t *this = (pgx32_driver_t *)(void *)this_gen;
 
-  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {  
+  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {
     this->vo_scale.force_redraw = 1;
     return 1;
   }
@@ -775,7 +775,7 @@
   munmap((void *)this->vregs, GFXP_REGS_MMAPLEN);
 
   _x_alphablend_free(&this->alphablend_extra_data);
-  
+
   free(this);
 }
 
@@ -799,7 +799,7 @@
   }
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->vo_driver.get_capabilities     = pgx32_get_capabilities;
   this->vo_driver.alloc_frame          = pgx32_alloc_frame;
   this->vo_driver.update_frame_format  = pgx32_update_frame_format;
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -213,7 +213,7 @@
   uint8_t *buffer_ptrs[3];
 } pgx64_frame_t;
 
-typedef struct {   
+typedef struct {
   vo_driver_t vo_driver;
   vo_scale_t vo_scale;
 
@@ -670,7 +670,7 @@
   DGA_DRAW_UNLOCK(this->dgadraw);
   XUnlockDisplay(this->display);
 
-  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {  
+  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {
     short int *cliprects, wx0, wy0, wx1, wy1, cx0, cy0, cx1, cy1;
     int dgavis;
 
@@ -990,7 +990,7 @@
           if (x + width - 1 > overlay->hili_right) {
             width -= overlay->hili_right - x;
             len += overlay->hili_right - x;
-          } 
+          }
         }
       }
 
@@ -998,7 +998,7 @@
         int j;
         clut_t *src_clut;
         uint8_t *src_trans;
-          
+
         if (use_clip_palette) {
           src_clut = (clut_t *)&overlay->hili_color;
           src_trans = (uint8_t *)&overlay->hili_trans;
@@ -1034,7 +1034,7 @@
               else {
                 palette[use_clip_palette][j] = BlackPixel(this->display, this->screen);
               }
-            } 
+            }
           }
           else {
             palette[use_clip_palette][j] = this->colour_key;
@@ -1272,7 +1272,7 @@
   DGA_DRAW_UNLOCK(this->dgadraw);
   XUnlockDisplay(this->display);
 
-  if (modif || _x_vo_scale_redraw_needed(&this->vo_scale)) {  
+  if (modif || _x_vo_scale_redraw_needed(&this->vo_scale)) {
     this->vo_scale.force_redraw = 1;
     this->chromakey_regen_needed = 1;
     return 1;
@@ -1319,7 +1319,7 @@
   if (strcmp(entry->key, "video.device.pgx64_colour_key") == 0) {
     pgx64_set_property(this_gen, VO_PROP_COLORKEY, entry->num_value);
     update_colour_key_rgb(this);
-  } 
+  }
   else if (strcmp(entry->key, "video.device.pgx64_chromakey_en") == 0) {
     this->chromakey_en = entry->num_value;
   }
diff --git a/src/video_out/video_out_raw.c b/src/video_out/video_out_raw.c
--- a/src/video_out/video_out_raw.c
+++ b/src/video_out/video_out_raw.c
@@ -155,23 +155,23 @@
     x = pos%ovl->ovl_w;
     y = pos/ovl->ovl_w;
     if ( (x>=overlay->hili_left && x<=overlay->hili_right) && (y>=overlay->hili_top && y<=overlay->hili_bottom) ) {
-    	colors = hili_colors;
-    	trans = hili_trans;
+	colors = hili_colors;
+	trans = hili_trans;
     }
     else {
-    	colors = low_colors;
-    	trans = low_trans;
+	colors = low_colors;
+	trans = low_trans;
     }
     rlelen = rle->len;
     clr = rle->color;
     alpha = trans[clr];
     for ( i=0; i<rlelen; ++i ) {
-    	rgba[0] = colors[clr].y;
-    	rgba[1] = colors[clr].cr;
-    	rgba[2] = colors[clr].cb;
-    	rgba[3] = alpha*255/15;
-    	rgba+= 4;
-    	++pos;
+	rgba[0] = colors[clr].y;
+	rgba[1] = colors[clr].cr;
+	rgba[2] = colors[clr].cb;
+	rgba[3] = alpha*255/15;
+	rgba+= 4;
+	++pos;
     }
     ++rle;
     --num_rle;
@@ -185,7 +185,7 @@
   raw_driver_t  *this = (raw_driver_t *) this_gen;
 
   if ( !changed )
-  	return;
+	return;
 
   ++this->ovl_changed;
 }
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -83,7 +83,7 @@
   vo_driver_t        vo_driver;
 
   config_values_t   *config;
-  
+
   int                hw_accel;
 
   SDL_Surface       *surface;
@@ -100,7 +100,7 @@
   int                screen;
   Drawable           drawable;
 #endif
-  
+
   vo_scale_t         sc;
   xine_t            *xine;
 
@@ -142,7 +142,7 @@
 
   if (!frame)
     return NULL;
-  
+
   pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 
   /*
@@ -207,8 +207,8 @@
     if (frame->overlay == NULL)
       return;
 
-	/* 
-	 * This needs to be done becuase I have found that 
+	/*
+	 * This needs to be done becuase I have found that
 	 * pixels isn't setup until this is called.
 	 */
     SDL_LockYUVOverlay (frame->overlay);
@@ -242,7 +242,7 @@
 
   this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
   this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
-  
+
   if (overlay->rle) {
     if( frame->format == XINE_IMGFMT_YV12 )
       _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
@@ -354,7 +354,7 @@
 static int sdl_get_property (vo_driver_t *this_gen, int property) {
 
   sdl_driver_t *this = (sdl_driver_t *) this_gen;
-  
+
   switch (property) {
     case VO_PROP_WINDOW_WIDTH:
       return this->sc.gui_width;
@@ -383,7 +383,7 @@
     if (value>=XINE_VO_ASPECT_NUM_RATIOS)
       value = XINE_VO_ASPECT_AUTO;
     this->sc.user_ratio = value;
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_sdl: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name_table[value]);
 
     sdl_compute_ideal_size (this);
@@ -458,7 +458,7 @@
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 
   _x_alphablend_free(&this->alphablend_extra_data);
-  
+
   free(this);
 }
 
@@ -476,16 +476,16 @@
 #ifdef HAVE_X11
   XWindowAttributes     window_attributes;
 #endif
-  
+
   this = (sdl_driver_t *) calloc(1, sizeof(sdl_driver_t));
   if (!this)
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->sdlflags = SDL_HWSURFACE | SDL_RESIZABLE;
-  
-  this->hw_accel = class->config->register_bool(class->config, 
+
+  this->hw_accel = class->config->register_bool(class->config,
     "video.device.sdl_hw_accel", 1,
     _("use hardware acceleration if available"),
     _("When your system supports it, hardware acceleration provided by your "
@@ -525,7 +525,7 @@
   if (!SDL_ListModes (vidInfo->vfmt, SDL_HWSURFACE | SDL_RESIZABLE)) {
     this->sdlflags = SDL_RESIZABLE;
     if (!SDL_ListModes (vidInfo->vfmt, SDL_RESIZABLE)) {
-      xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 	       "video_out_sdl: open_plugin - sdl couldn't get any acceptable video mode\n");
       return NULL;
     }
@@ -533,7 +533,7 @@
 
   this->bpp = vidInfo->vfmt->BitsPerPixel;
   if (this->bpp < 16) {
-    xprintf(this->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("sdl has to emulate a 16 bit surfaces, that will slow things down.\n"));
     this->bpp = 16;
   }
@@ -580,17 +580,17 @@
 static void *init_class (xine_t *xine, void *visual_gen) {
   /* x11_visual_t     *visual = (x11_visual_t *) visual_gen; */
   sdl_class_t      *this;
-  
+
   /* check if we have SDL */
   if ((SDL_Init (SDL_INIT_VIDEO)) < 0) {
-    xprintf (xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (xine, XINE_VERBOSITY_DEBUG,
 	     "video_out_sdl: open_plugin - sdl video initialization failed.\n");
     return NULL;
   }
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 
   this = (sdl_class_t*) calloc(1, sizeof(sdl_class_t));
-   
+
   this->driver_class.open_plugin      = open_plugin;
   this->driver_class.identifier       = "SDL";
   this->driver_class.description      = N_("xine video output plugin using the Simple Direct Media Layer");
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -22,7 +22,7 @@
  *
  * based on video_out_sdl from
  *   Miguel Freitas
- *   
+ *
  * based on mpeg2dec code from
  *   Ryan C. Gordon <icculus@...> and
  *   Dominik Schnitzer <aeneas@...>
@@ -82,9 +82,9 @@
     vo_driver_t        vo_driver;
 
     /* stk private data */
-    config_values_t*   config;           
-    surface_t*         surface;          
-    xine_panel_t*      xine_panel; 
+    config_values_t*   config;
+    surface_t*         surface;
+    xine_panel_t*      xine_panel;
     uint8_t            bpp;              /* do we need this ? */
     pthread_mutex_t    mutex;
     uint32_t           capabilities;
@@ -171,25 +171,25 @@
     //printf("video_out_stk: update_frame_format()\n");
 
     if ((frame->width != width) || (frame->height != height) || (frame->format != format)) {
-      lprintf("update_frame_format - %d=%d, %d=%d, %d=%d\n", 
+      lprintf("update_frame_format - %d=%d, %d=%d, %d=%d\n",
 	      frame->width, width, frame->height, height, frame->format, format);
-      lprintf("vo_frame data - width, height, format: %d, %d, %d\n", 
+      lprintf("vo_frame data - width, height, format: %d, %d, %d\n",
 	     frame->vo_frame.width, frame->vo_frame.height, frame->vo_frame.format);
-       
+
         /* (re-) allocate image */
         if (frame->overlay) {
-            stk_overlay_free(frame->overlay); 
+            stk_overlay_free(frame->overlay);
             frame->overlay = NULL;
         }
 
         if (format == XINE_IMGFMT_YV12) {
 	  lprintf ("format YV12\n");
-	  frame->overlay = stk_surface_create_overlay(this->surface, width, height, 
+	  frame->overlay = stk_surface_create_overlay(this->surface, width, height,
 						      STK_FORMAT_YV12);
 
         } else if (format == XINE_IMGFMT_YUY2) {
 	  lprintf("format YUY2\n");
-	  frame->overlay = stk_surface_create_overlay(this->surface, width, height, 
+	  frame->overlay = stk_surface_create_overlay(this->surface, width, height,
 						      STK_FORMAT_YUY2);
         }
 
@@ -197,7 +197,7 @@
             return;
 
         /* From the SDL driver:
-         * This needs to be done becuase I have found that 
+         * This needs to be done becuase I have found that
          * pixels isn't setup until this is called.
          */
         stk_overlay_lock(frame->overlay);
@@ -224,7 +224,7 @@
     stk_driver_t* this = (stk_driver_t*)this_gen;
     stk_frame_t* frame = (stk_frame_t*)frame_gen;
     //printf("video_out_stk: overlay_blend()\n");
-  
+
     this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
     this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
 
@@ -238,7 +238,7 @@
 }
 
 static void stk_check_events (stk_driver_t* this) {
-    /* SDL checks for a resize, our video panels aren't resizeable... */    
+    /* SDL checks for a resize, our video panels aren't resizeable... */
     //printf("video_out_stk: check_events()\n");
 }
 
@@ -247,7 +247,7 @@
     stk_driver_t* this = (stk_driver_t*)this_gen;
     int ret = 0;
     static int last_gui_width, last_gui_height;
-    
+
     //printf("video_out_stk: redraw_needed()\n");
 
     if( last_gui_width != this->sc.gui_width ||
@@ -273,7 +273,7 @@
     stk_frame_t* frame = (stk_frame_t*)frame_gen;
 
     //printf("video_out_stk: display_frame()\n");
-    
+
     pthread_mutex_lock(&this->mutex);
 
     if ( (frame->width != this->sc.delivered_width)
@@ -308,7 +308,7 @@
 
 static int stk_get_property (vo_driver_t* this_gen, int property) {
     stk_driver_t* this = (stk_driver_t *)this_gen;
-    
+
     //printf("video_out_stk: get_property()\n");
 
     if (property == VO_PROP_ASPECT_RATIO)
@@ -321,7 +321,7 @@
     stk_driver_t* this = (stk_driver_t*)this_gen;
 
     //printf("video_out_stk: set_property()\n");
-    
+
     if ( property == VO_PROP_ASPECT_RATIO) {
         if (value>=XINE_VO_ASPECT_NUM_RATIOS)
             value = XINE_VO_ASPECT_AUTO;
@@ -341,7 +341,7 @@
     //printf("video_out_stk: get_property_min_max()\n");
 }
 
-static int stk_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) { 
+static int stk_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) {
     stk_driver_t *this = (stk_driver_t*)this_gen;
 
     switch (data_type)
@@ -349,9 +349,9 @@
         case XINE_GUI_SEND_COMPLETION_EVENT:
             break;
 
-        case XINE_GUI_SEND_EXPOSE_EVENT: 
+        case XINE_GUI_SEND_EXPOSE_EVENT:
             break;
-            
+
         case XINE_GUI_SEND_DRAWABLE_CHANGED:
             this->xine_panel = (xine_panel_t*)data;
             this->surface = stk_xine_panel_surface(this->xine_panel);
@@ -365,18 +365,18 @@
         case XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO:
             break;
     }
-    
+
     return 0;
 }
 
 static void stk_dispose (vo_driver_t * this_gen) {
     stk_driver_t* this = (stk_driver_t*)this_gen;
-    
+
     //printf("video_out_stk: dispose()\n");
-    
-    /* FIXME: any libstk deleting must be done in the app or library 
+
+    /* FIXME: any libstk deleting must be done in the app or library
      * since we didn't create the surface */
-    
+
     _x_alphablend_free(&this->alphablend_extra_data);
 
     free(this);
@@ -386,9 +386,9 @@
     stk_class_t * class = (stk_class_t *) class_gen;
     /* allocate the video output driver class */
     stk_driver_t*        this;
-    
+
     //printf("video_out_stk: open_plugin()\n");
-    
+
     this = calloc(1, sizeof (stk_driver_t));
     if (!this)
       return NULL;
@@ -432,7 +432,7 @@
     /* FIXME: move this to the stk SDL driver code */
     xine_setenv("SDL_VIDEO_YUV_HWACCEL", "1", 1);
     xine_setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1);
-    
+
     xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 	     "video_out_stk: warning, xine's STK driver is EXPERIMENTAL\n");
     return &this->vo_driver;
@@ -444,7 +444,7 @@
  */
 static void *init_class (xine_t *xine, void *visual_gen) {
     stk_class_t* this;
-    
+
     //printf("video_out_stk: init_class()\n");
 
     this = calloc(1, sizeof(stk_class_t));
@@ -453,7 +453,7 @@
     this->driver_class.identifier       = "stk";
     this->driver_class.description      = N_("xine video output plugin using the Libstk Surface Set-top Toolkit");
     this->driver_class.dispose          = default_video_driver_class_dispose;
-    
+
     this->config                        = xine->config;
     this->xine                          = xine;
 
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -65,7 +65,7 @@
 #ifdef HAVE_X11
 #include "x11osd.h"
 #endif
-              
+
 #define NUM_FRAMES 3
 
 typedef struct vidix_driver_s vidix_driver_t;
@@ -109,16 +109,16 @@
 
   uint32_t            colourkey;
   int                 use_doublebuffer;
-    
+
   int                 supports_yv12;
-          
+
   pthread_mutex_t     mutex;
 
   vidix_property_t    props[VO_NUM_PROPERTIES];
   uint32_t            capabilities;
 
   int                 visual_type;
-  
+
   /* X11 related stuff */
 #ifdef HAVE_X11
   Display            *display;
@@ -128,17 +128,17 @@
   x11osd              *xoverlay;
   int                  ovl_changed;
 #endif
-  
+
   /* fb related stuff */
   int                 fb_width;
   int                 fb_height;
-  
+
   int                 depth;
 
   vo_scale_t          sc;
 
   int                 delivered_format;
-  
+
   xine_t             *xine;
 
   alphablend_t        alphablend_extra_data;
@@ -151,7 +151,7 @@
 
   VDL_HANDLE          vidix_handler;
   vidix_capability_t  vidix_cap;
-  
+
   xine_t             *xine;
 } vidix_class_t;
 
@@ -175,7 +175,7 @@
 }
 
 static void write_frame_YUV420P2(vidix_driver_t* this, vidix_frame_t* frame)
-{   
+{
    uint8_t* y    = frame->vo_frame.base[0] + this->sc.displayed_xoffset +
                      this->sc.displayed_yoffset*frame->vo_frame.pitches[0];
    uint8_t* cb   = frame->vo_frame.base[1] + this->sc.displayed_xoffset/2 +
@@ -183,16 +183,16 @@
    uint8_t* cr   = frame->vo_frame.base[2]+this->sc.displayed_xoffset/2 +
                      this->sc.displayed_yoffset*frame->vo_frame.pitches[2]/2;
    uint8_t* dst8 = (this->vidix_mem +
-                    this->vidix_play.offsets[this->next_frame] + 
+                    this->vidix_play.offsets[this->next_frame] +
                     this->vidix_play.offset.y);
-   int h, w; 
-   
+   int h, w;
+
    for(h = 0; h < this->sc.displayed_height; h++) {
       xine_fast_memcpy(dst8, y, this->sc.displayed_width);
       y    += frame->vo_frame.pitches[0];
       dst8 += this->dstrides.y;
    }
-   
+
    dst8 = (this->vidix_mem + this->vidix_play.offsets[this->next_frame] +
            this->vidix_play.offset.v);
 
@@ -211,7 +211,7 @@
 {
   uint8_t *base = this->vidix_mem+this->vidix_play.offsets[this->next_frame];
 
-  switch(frame->format) {   
+  switch(frame->format) {
     case XINE_IMGFMT_YUY2:
       yuy2_to_yuy2(
        /* src */
@@ -223,7 +223,7 @@
        /* width x height */
         this->sc.displayed_width, this->sc.displayed_height);
       break;
-      
+
     case XINE_IMGFMT_YV12: {
       uint8_t* y  = frame->vo_frame.base[0] + this->sc.displayed_xoffset +
                       this->sc.displayed_yoffset*frame->vo_frame.pitches[0];
@@ -231,7 +231,7 @@
                       this->sc.displayed_yoffset*frame->vo_frame.pitches[1]/2;
       uint8_t* cr = frame->vo_frame.base[2] + this->sc.displayed_xoffset/2 +
                       this->sc.displayed_yoffset*frame->vo_frame.pitches[2]/2;
-      
+
       if(this->supports_yv12) {
         if(this->vidix_play.flags & VID_PLAY_INTERLEAVED_UV)
           write_frame_YUV420P2(this, frame);
[... 753 lines omitted ...]
     _("video overlay colour key blue component"),
     _("The colour key is used to tell the graphics card where to overlay the video image. "
       "Try different values, if you experience windows becoming transparent."), 20,
-    (void*) vidix_ckey_callback, this);     
-    
+    (void*) vidix_ckey_callback, this);
+
   vidix_update_colourkey(this);
 
   query_fourccs(this);
 
   XLockDisplay (this->display);
-  if(this->colourkey) { 
+  if(this->colourkey) {
     this->xoverlay = x11osd_create (this->xine, this->display, this->screen,
                                     this->drawable, X11OSD_COLORKEY);
     if(this->xoverlay)
       x11osd_colorkey(this->xoverlay, this->colourkey, &this->sc);
   } else {
-    this->xoverlay = x11osd_create (this->xine, this->display, this->screen, 
+    this->xoverlay = x11osd_create (this->xine, this->display, this->screen,
                                     this->drawable, X11OSD_SHAPED);
   }
   XUnlockDisplay (this->display);
@@ -1204,14 +1204,14 @@
 static void *vidix_init_class (xine_t *xine, void *visual_gen) {
 
   vidix_class_t *this = init_class (xine, visual_gen);
-  
+
   if(this) {
     this->driver_class.open_plugin     = vidix_open_plugin;
     this->driver_class.identifier      = "vidix";
     this->driver_class.description     = N_("xine video output plugin using libvidix for x11");
     this->driver_class.dispose         = default_video_driver_class_dispose;
   }
-  
+
   return this;
 }
 
@@ -1228,9 +1228,9 @@
   char                     *device;
   int                       fd;
   struct fb_var_screeninfo  fb_var;
-    
+
   this->visual_type = XINE_VISUAL_TYPE_FB;
-  
+
   /* Register config option for fb device */
   device = config->register_filename(config, "video.device.vidixfb_device", "/dev/fb0", XINE_CONFIG_STRING_IS_DEVICE_NAME,
     _("framebuffer device name"),
@@ -1239,53 +1239,53 @@
       "can be used to fill this file with arbitrary content. So you should be careful that "
       "the value you enter really is a proper framebuffer device."),
     XINE_CONFIG_SECURITY, NULL, NULL);
-  
+
   /* Open fb device for reading */
   if((fd = open("/dev/fb0", O_RDONLY)) < 0) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_vidix: unable to open frame buffer device \"%s\": %s\n", device, strerror(errno));
     return NULL;
   }
-  
+
   /* Read screen info */
   if(ioctl(fd, FBIOGET_VSCREENINFO, &fb_var) != 0) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_vidix: error in ioctl FBIOGET_VSCREENINFO: %s", strerror(errno));
     close(fd);
     return NULL;
   }
-  
+
   /* Store screen bpp and dimensions */
   this->depth = fb_var.bits_per_pixel;
   this->fb_width = fb_var.xres;
   this->fb_height = fb_var.yres;
-  
+
   /* Close device */
   close(fd);
-  
+
   this->sc.frame_output_cb   = vidixfb_frame_output_cb;
   this->sc.user_data         = this;
-  
+
   /* Make sure colour keying is turned off */
   this->vidix_grkey.ckey.op = CKEY_FALSE;
   vdlSetGrKeys(this->vidix_handler, &this->vidix_grkey);
-    
+
   query_fourccs(this);
-  
+
   return &this->vo_driver;
 }
 
 static void *vidixfb_init_class (xine_t *xine, void *visual_gen) {
 
   vidix_class_t *this = init_class (xine, visual_gen);
-  
+
   if(this) {
     this->driver_class.open_plugin     = vidixfb_open_plugin;
     this->driver_class.identifier      = "vidixfb";
     this->driver_class.description     = N_("xine video output plugin using libvidix for linux frame buffer");
     this->driver_class.dispose         = default_video_driver_class_dispose;
   }
-  
+
   return this;
 }
 
@@ -1300,7 +1300,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
 #ifdef HAVE_X11
   { PLUGIN_VIDEO_OUT, 22, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class },
 #endif

diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2003, 2007-2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -23,7 +23,7 @@
  * Aaron Holtzman <aholtzma@...>
  *
  * xine-specific code by Guenter Bartsch <bartscgr@...>
- * 
+ *
  * ported to xcb by Christoph Pfister - Feb 2007
  */
 
@@ -77,7 +77,7 @@
   int                flags;
 
   vo_scale_t         sc;
-    
+
   uint8_t           *image;
   int                bytes_per_line;
   xcb_shm_seg_t      shmseg;
@@ -100,7 +100,7 @@
   int                bpp;
   int                scanline_pad;
   int                use_shm;
-  
+
   int                yuv2rgb_brightness;
   int                yuv2rgb_contrast;
   int                yuv2rgb_saturation;
@@ -108,7 +108,7 @@
   yuv2rgb_factory_t *yuv2rgb_factory;
 
   vo_scale_t         sc;
-  
+
   xshm_frame_t      *cur_frame;
   xcbosd            *xoverlay;
   int                ovl_changed;
@@ -130,7 +130,7 @@
 
 
 /*
- * allocate an XImage, try XShm first but fall back to 
+ * allocate an XImage, try XShm first but fall back to
  * plain X11 if XShm should fail
  */
 static void create_ximage(xshm_driver_t *this, xshm_frame_t *frame, int width, int height)
@@ -156,9 +156,9 @@
 	      _("%s: => not using MIT Shared Memory extension.\n"), LOG_MODULE);
       goto shm_fail1;
     }
-  
+
     frame->image = shmat(shmid, 0, 0);
-  
+
     if (frame->image == ((void *) -1)) {
       xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: shared memory error (address error) when allocating image \n"), LOG_MODULE);
@@ -180,10 +180,10 @@
       goto shm_fail3;
     }
 
-    /* 
+    /*
      * Now that the Xserver has learned about and attached to the
      * shared memory segment,  delete it.  It's actually deleted by
-     * the kernel when all users of that segment have detached from 
+     * the kernel when all users of that segment have detached from
      * it.  Gives an automatic shared memory cleanup in case we crash.
      */
 
@@ -236,10 +236,10 @@
 static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   /*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
-  
-  vo_img->proc_called = 1;                                    
-  
-  if( frame->vo_frame.crop_left || frame->vo_frame.crop_top || 
+
+  vo_img->proc_called = 1;
+
+  if( frame->vo_frame.crop_left || frame->vo_frame.crop_top ||
       frame->vo_frame.crop_right || frame->vo_frame.crop_bottom )
   {
     /* we don't support crop, so don't even waste cpu cycles.
@@ -247,7 +247,7 @@
      */
     return;
   }
-  
+
   lprintf ("copy... (format %d)\n", frame->format);
 
   if (frame->format == XINE_IMGFMT_YV12)
@@ -256,7 +256,7 @@
   else
     frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
 				  src[0]);
-  
+
   lprintf ("copy...done\n");
 }
 
@@ -313,10 +313,10 @@
   /*
    * supply required functions/fields
    */
-  
[... 259 lines omitted ...]
-  
+
   case XINE_GUI_SEND_DRAWABLE_CHANGED:
     this->window = (xcb_window_t) data;
 
@@ -881,7 +881,7 @@
     if (this->cur_frame) {
       x11_rectangle_t *rect = data;
       int              x1, y1, x2, y2;
-      
+
       _x_vo_scale_translate_gui2video(&this->cur_frame->sc,
 			       rect->x, rect->y,
 			       &x1, &y1);
@@ -904,16 +904,16 @@
 
 static void xshm_dispose (vo_driver_t *this_gen) {
   xshm_driver_t *this = (xshm_driver_t *) this_gen;
-  
+
   if (this->cur_frame)
     this->cur_frame->vo_frame.dispose (&this->cur_frame->vo_frame);
 
   this->yuv2rgb_factory->dispose (this->yuv2rgb_factory);
-  
+
   pthread_mutex_lock(&this->main_mutex);
   xcb_free_gc(this->connection, this->gc);
   pthread_mutex_unlock(&this->main_mutex);
-  
+
   if( this->xoverlay ) {
     pthread_mutex_lock(&this->main_mutex);
     xcbosd_destroy(this->xoverlay);
@@ -923,7 +923,7 @@
   pthread_mutex_destroy(&this->main_mutex);
 
   _x_alphablend_free(&this->alphablend_extra_data);
-  
+
   free (this);
 }
 
@@ -1008,7 +1008,7 @@
   xcb_get_geometry_reply_t *geometry_reply;
 
   const xcb_query_extension_reply_t *query_extension_reply;
-  
+
   this = (xshm_driver_t *) calloc(1, sizeof(xshm_driver_t));
 
   if (!this)
@@ -1017,7 +1017,7 @@
   pthread_mutex_init(&this->main_mutex, NULL);
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->connection          = visual->connection;
   this->screen              = visual->screen;
   this->window              = visual->window;
@@ -1026,15 +1026,15 @@
   this->sc.frame_output_cb  = visual->frame_output_cb;
   this->sc.dest_size_cb     = visual->dest_size_cb;
   this->sc.user_data        = visual->user_data;
-  
+
   this->sc.user_ratio       = XINE_VO_ASPECT_AUTO;
-  
+
   this->cur_frame           = NULL;
   this->gc                  = xcb_generate_id(this->connection);
   xcb_create_gc(this->connection, this->gc, this->window, XCB_GC_FOREGROUND, &this->screen->black_pixel);
   this->xoverlay            = NULL;
   this->ovl_changed         = 0;
- 
+
   this->xine                = class->xine;
 
   this->vo_driver.get_capabilities     = xshm_get_capabilities;
@@ -1102,7 +1102,7 @@
   query_extension_reply = xcb_get_extension_data(this->connection, &xcb_shm_id);
   if (query_extension_reply && query_extension_reply->present) {
     this->use_shm = 1;
-  } 
+  }
   else {
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("%s: MIT shared memory extension not present on display.\n"), LOG_MODULE);
@@ -1141,7 +1141,7 @@
    */
   cpu_byte_order = htonl(1) == 1 ? XCB_IMAGE_ORDER_MSB_FIRST : XCB_IMAGE_ORDER_LSB_FIRST;
   swapped = cpu_byte_order != image_byte_order;
-  
+
   xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	  LOG_MODULE ": video mode depth is %d (%d bpp), %s, %sswapped,\n"
 	  LOG_MODULE ": red: %08x, green: %08x, blue: %08x\n",
@@ -1203,16 +1203,16 @@
   }
 
   if (!mode) {
-    xprintf (this->xine, XINE_VERBOSITY_LOG, 
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
 	     _("%s: your video mode was not recognized, sorry :-(\n"), LOG_MODULE);
     return NULL;
   }
-  
+
   this->yuv2rgb_brightness = 0;
   this->yuv2rgb_contrast   = 128;
   this->yuv2rgb_saturation = 128;
-  
-  this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped, 
+
+  this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped,
 						this->yuv2rgb_cmap);
   this->yuv2rgb_factory->set_csc_levels (this->yuv2rgb_factory,
 					 this->yuv2rgb_brightness,
@@ -1253,7 +1253,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -191,7 +191,7 @@
   frame = (xv_frame_t *) calloc(1, sizeof(xv_frame_t));
   if (!frame)
     return NULL;
-  
+
   pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 
   /*
@@ -380,7 +380,7 @@
     if(format == XINE_IMGFMT_YUY2) {
       frame->vo_frame.pitches[0] = frame->xv_pitches[0];
       frame->vo_frame.base[0] = frame->image + frame->xv_offsets[0];
-    } 
+    }
     else {
       frame->vo_frame.pitches[0] = frame->xv_pitches[0];
       frame->vo_frame.pitches[1] = frame->xv_pitches[2];
@@ -428,12 +428,12 @@
 				  this->sc.output_width, this->sc.output_height };
     xcb_poly_fill_rectangle(this->connection, this->window, this->gc, 1, &rectangle);
   }
-  
+
   if (this->xoverlay) {
     xcbosd_resize(this->xoverlay, this->sc.gui_width, this->sc.gui_height);
     this->ovl_changed = 1;
   }
-  
+
   pthread_mutex_unlock(&this->main_mutex);
 }
 
@@ -456,7 +456,7 @@
   _x_vo_scale_compute_output_size( &this->sc );
 }
 
-static void xv_overlay_begin (vo_driver_t *this_gen, 
+static void xv_overlay_begin (vo_driver_t *this_gen,
 			      vo_frame_t *frame_gen, int changed) {
   xv_driver_t  *this = (xv_driver_t *) this_gen;
 
@@ -467,7 +467,7 @@
     xcbosd_clear(this->xoverlay);
     pthread_mutex_unlock(&this->main_mutex);
   }
-  
+
   this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
   this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
 }
@@ -484,7 +484,7 @@
   this->ovl_changed = 0;
 }
 
-static void xv_overlay_blend (vo_driver_t *this_gen, 
+static void xv_overlay_blend (vo_driver_t *this_gen,
 			      vo_frame_t *frame_gen, vo_overlay_t *overlay) {
   xv_driver_t  *this = (xv_driver_t *) this_gen;
   xv_frame_t   *frame = (xv_frame_t *) frame_gen;
@@ -498,11 +498,11 @@
       }
     } else {
       if (frame->format == XINE_IMGFMT_YV12)
-        _x_blend_yuv(frame->vo_frame.base, overlay, 
+        _x_blend_yuv(frame->vo_frame.base, overlay,
 		  frame->width, frame->height, frame->vo_frame.pitches,
                   &this->alphablend_extra_data);
       else
-        _x_blend_yuy2(frame->vo_frame.base[0], overlay, 
+        _x_blend_yuy2(frame->vo_frame.base[0], overlay,
 		   frame->width, frame->height, frame->vo_frame.pitches[0],
                    &this->alphablend_extra_data);
     }
@@ -546,7 +546,7 @@
     this->sc.delivered_height = this->cur_frame->height;
     this->sc.delivered_width  = this->cur_frame->width;
     this->sc.delivered_ratio  = this->cur_frame->ratio;
-    
+
     this->sc.crop_left        = this->cur_frame->vo_frame.crop_left;
     this->sc.crop_right       = this->cur_frame->vo_frame.crop_right;
     this->sc.crop_top         = this->cur_frame->vo_frame.crop_top;
@@ -575,7 +575,7 @@
   /*
   printf (LOG_MODULE ": xv_display_frame...\n");
   */
-  
+
   /*
    * queue frames (deinterlacing)
    * free old frames
@@ -665,7 +665,7 @@
 static void xv_property_callback (void *property_gen, xine_cfg_entry_t *entry) {
   xv_property_t *property = (xv_property_t *) property_gen;
   xv_driver_t   *this = property->this;
-  
+
   pthread_mutex_lock(&this->main_mutex);
   xcb_xv_set_port_attribute(this->connection, this->xv_port,
 			    property->atom, entry->num_value);
@@ -699,7 +699,7 @@
       this->props[property].entry->num_value = this->props[property].value;
 
     return this->props[property].value;
-  } 
+  }
   else {
     switch (property) {
     case VO_PROP_ASPECT_RATIO:
@@ -707,7 +707,7 @@
 	value = XINE_VO_ASPECT_AUTO;
 
       this->props[property].value = value;
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      LOG_MODULE ": VO_PROP_ASPECT_RATIO(%d)\n", this->props[property].value);
       this->sc.user_ratio = value;
 
@@ -721,7 +721,7 @@
         this->props[property].value = value;
 	xprintf(this->xine, XINE_VERBOSITY_LOG,
 		LOG_MODULE ": VO_PROP_ZOOM_X = %d\n", this->props[property].value);
-	
+
[... 60 lines omitted ...]
 }
 
@@ -939,7 +939,7 @@
   pthread_mutex_destroy(&this->main_mutex);
 
   _x_alphablend_free(&this->alphablend_extra_data);
-  
+
   free (this);
 }
 
@@ -954,7 +954,7 @@
   if (!list_formats_reply)
     return 1; /* no formats listed; probably due to an invalid port no. */
   format_it = xcb_xv_list_image_formats_format_iterator(list_formats_reply);
-  
+
   for (; format_it.rem; xcb_xv_image_format_info_next(&format_it))
     if ((format_it.data->id == XINE_IMGFMT_YV12) &&
 	(! (strcmp ((char *) format_it.data->guid, "YV12")))) {
@@ -981,7 +981,7 @@
 
   xcb_intern_atom_cookie_t atom_cookie;
   xcb_intern_atom_reply_t *atom_reply;
-   
+
   /*
    * some Xv drivers (Gatos ATI) report some ~0 as max values, this is confusing.
    */
@@ -1011,7 +1011,7 @@
   /* might be overridden using config entry */
   if(strcmp(str_prop, "XV_AUTOPAINT_COLORKEY") == 0)
     int_default = 0;
-    
+
   if (config_name) {
     /* is this a boolean property ? */
     if ((attr->min == 0) && (attr->max == 1)) {
@@ -1028,12 +1028,12 @@
 
     entry = this->config->lookup_entry (this->config, config_name);
 
-    if((entry->num_value < this->props[property].min) || 
+    if((entry->num_value < this->props[property].min) ||
        (entry->num_value > this->props[property].max)) {
 
-      this->config->update_num(this->config, config_name, 
+      this->config->update_num(this->config, config_name,
 			       ((this->props[property].min + this->props[property].max) >> 1));
-      
+
       entry = this->config->lookup_entry (this->config, config_name);
     }
 
@@ -1175,7 +1175,7 @@
   pthread_mutex_init(&this->main_mutex, NULL);
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->connection        = visual->connection;
   this->screen            = visual->screen;
   this->window            = visual->window;
@@ -1241,16 +1241,16 @@
 	    _("%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 	      "\tLooks like your graphics hardware driver doesn't support Xv?!\n"),
 	    LOG_MODULE);
-    
+
     /* XvFreeAdaptorInfo (adaptor_info); this crashed on me (gb)*/
     return NULL;
-  } 
+  }
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %d from adaptor %s for hardware "
 	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             xcb_xv_adaptor_info_name(adaptor_it.data));
-  
+
   this->xv_port           = xv_port;
 
   _x_vo_scale_init (&this->sc, 1, 0, config );
@@ -1366,10 +1366,10 @@
 				   VIDEO_DEVICE_XV_DOUBLE_BUFFER_HELP,
 				   20, xv_update_XV_DOUBLE_BUFFER, this);
 	  config->update_num(config,"video.device.xv_double_buffer",xv_double_buffer);
- 	} else if(!strcmp(name, sync_atoms[this->sync_is_vsync = 0]) ||
- 		  !strcmp(name, sync_atoms[this->sync_is_vsync = 1])) {
+	} else if(!strcmp(name, sync_atoms[this->sync_is_vsync = 0]) ||
+		  !strcmp(name, sync_atoms[this->sync_is_vsync = 1])) {
 	  int xv_sync_to_vblank;
-	  xv_sync_to_vblank = 
+	  xv_sync_to_vblank =
 	    config->register_bool (config, "video.device.xv_sync_to_vblank", 1,
 	      _("enable vblank sync"),
 	      _("This option will synchronize the update of the video image to the "
@@ -1402,10 +1402,10 @@
   list_formats_reply = xcb_xv_list_image_formats_reply(this->connection, list_formats_cookie, NULL);
 
   format_it = xcb_xv_list_image_formats_format_iterator(list_formats_reply);
-  
+
   this->xv_format_yv12 = 0;
   this->xv_format_yuy2 = 0;
-  
+
   for (; format_it.rem; xcb_xv_image_format_info_next(&format_it)) {
     lprintf ("Xv image format: 0x%x (%4.4s) %s\n",
 	     format_it.data->id, (char*)&format_it.data->id,
@@ -1422,7 +1422,7 @@
     case XINE_IMGFMT_YUY2:
       this->xv_format_yuy2 = format_it.data->id;
       this->capabilities |= VO_CAP_YUY2;
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: this adaptor supports the %s format.\n"), LOG_MODULE, "YUY2");
       break;
     default:
@@ -1432,7 +1432,7 @@
 
   free(list_formats_reply);
 
-  this->use_pitch_alignment = 
+  this->use_pitch_alignment =
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
 			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xv_update_xv_pitch_alignment, this);

diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2000-2003, 2008 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -82,7 +82,7 @@
   int                flags;
 
   vo_scale_t         sc;
-    
+
   XImage            *image;
   XShmSegmentInfo    shminfo;
 
@@ -104,7 +104,7 @@
   int                depth, bpp, bytes_per_pixel, image_byte_order;
   int                use_shm;
   XColor             black;
-  
+
   int                yuv2rgb_brightness;
   int                yuv2rgb_contrast;
   int                yuv2rgb_saturation;
@@ -112,7 +112,7 @@
   yuv2rgb_factory_t *yuv2rgb_factory;
 
   vo_scale_t         sc;
-  
+
   xshm_frame_t      *cur_frame;
   x11osd            *xoverlay;
   int                ovl_changed;
@@ -168,11 +168,11 @@
 }
 
 /*
- * allocate an XImage, try XShm first but fall back to 
+ * allocate an XImage, try XShm first but fall back to
  * plain X11 if XShm should fail
  */
 /* called xlocked */
-static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo, 
+static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
 			      int width, int height) {
   XImage *myimage = NULL;
 
@@ -181,16 +181,16 @@
     /*
      * try shm
      */
-    
+
     gX11Fail = 0;
     x11_InstallXErrorHandler (this);
 
-    myimage = XShmCreateImage(this->display, 
+    myimage = XShmCreateImage(this->display,
 			      this->visual,
 			      this->depth,
 			      ZPixmap, NULL,
 			      shminfo,
-			      width, 
+			      width,
 			      height);
 
     if (myimage == NULL )  {
@@ -201,15 +201,15 @@
       this->use_shm = 0;
       goto finishShmTesting;
     }
-  
+
     this->bpp = myimage->bits_per_pixel;
     this->bytes_per_pixel = this->bpp / 8;
     this->image_byte_order = myimage->byte_order;
-    
+
     shminfo->shmid=shmget(IPC_PRIVATE,
-			  myimage->bytes_per_line * myimage->height, 
+			  myimage->bytes_per_line * myimage->height,
 			  IPC_CREAT | 0777);
-    
+
     if (shminfo->shmid < 0 ) {
       xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: %s: allocating image\n"), LOG_MODULE, strerror(errno));
@@ -218,9 +218,9 @@
       this->use_shm = 0;
       goto finishShmTesting;
     }
-  
+
     shminfo->shmaddr  = (char *) shmat(shminfo->shmid, 0, 0);
-  
+
     if (shminfo->shmaddr == ((char *) -1)) {
       xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: shared memory error (address error) when allocating image \n"), LOG_MODULE);
@@ -231,12 +231,12 @@
       this->use_shm = 0;
       goto finishShmTesting;
     }
-  
+
     shminfo->readOnly = False;
     myimage->data = shminfo->shmaddr;
-  
+
     XShmAttach(this->display, shminfo);
-  
+
     XSync(this->display, False);
 
[... 405 lines omitted ...]
   Atom                to_get;
-  
+
   retval = NULL;
   length = 0x7fffffff;
   to_get = XInternAtom(this->display, "_IMLIB_COLORMAP", False);
@@ -1029,7 +1029,7 @@
     if (format_ret == 8) {
       unsigned int i;
       unsigned long j;
-	  
+
       j = 1 + retval[0]*4;
       this->yuv2rgb_cmap = malloc(sizeof(uint8_t) * 32 * 32 * 32);
       for (i = 0; i < 32 * 32 * 32 && j < num_ret; i++)
@@ -1077,14 +1077,14 @@
   int			swapped;
   int			cpu_byte_order;
   XColor                dummy;
-  
+
   this = (xshm_driver_t *) calloc(1, sizeof(xshm_driver_t));
 
   if (!this)
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->display		    = visual->display;
   this->screen		    = visual->screen;
 
@@ -1097,9 +1097,9 @@
   this->sc.frame_output_cb  = visual->frame_output_cb;
   this->sc.dest_size_cb     = visual->dest_size_cb;
   this->sc.user_data        = visual->user_data;
-  
+
   this->sc.user_ratio       = XINE_VO_ASPECT_AUTO;
-  
+
   this->drawable	    = visual->d;
   this->cur_frame           = NULL;
   LOCK_DISPLAY(this);
@@ -1107,7 +1107,7 @@
   UNLOCK_DISPLAY(this);
   this->xoverlay                = NULL;
   this->ovl_changed             = 0;
- 
+
   this->x11_old_error_handler = NULL;
   this->xine                  = class->xine;
 
@@ -1124,7 +1124,7 @@
   this->vo_driver.gui_data_exchange    = xshm_gui_data_exchange;
   this->vo_driver.dispose              = xshm_dispose;
   this->vo_driver.redraw_needed        = xshm_redraw_needed;
-  
+
   LOCK_DISPLAY(this);
   XAllocNamedColor (this->display,
 		    DefaultColormap (this->display, this->screen),
@@ -1146,7 +1146,7 @@
   UNLOCK_DISPLAY(this);
   this->visual = attribs.visual;
   this->depth  = attribs.depth;
-  
+
   if (this->depth>16)
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("\n\nWARNING: current display depth is %d. For better performance\n"
@@ -1159,7 +1159,7 @@
   LOCK_DISPLAY(this);
   if (XShmQueryExtension(this->display)) {
     this->use_shm = 1;
-  } 
+  }
   else {
     xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("%s: MIT shared memory extension not present on display.\n"), LOG_MODULE);
@@ -1181,7 +1181,7 @@
    */
   cpu_byte_order = htonl(1) == 1 ? MSBFirst : LSBFirst;
   swapped = cpu_byte_order != this->image_byte_order;
-  
+
   xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	  LOG_MODULE ": video mode depth is %d (%d bpp), %s, %sswapped,\n"
 	  LOG_MODULE ": red: %08lx, green: %08lx, blue: %08lx\n",
@@ -1245,16 +1245,16 @@
   }
 
   if (!mode) {
-    xprintf (this->xine, XINE_VERBOSITY_LOG, 
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
 	     _("%s: your video mode was not recognized, sorry :-(\n"), LOG_MODULE);
     return NULL;
   }
-  
+
   this->yuv2rgb_brightness = 0;
   this->yuv2rgb_contrast   = 128;
   this->yuv2rgb_saturation = 128;
-  
-  this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped, 
+
+  this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped,
 						this->yuv2rgb_cmap);
   this->yuv2rgb_factory->set_csc_levels (this->yuv2rgb_factory,
 					 this->yuv2rgb_brightness,
@@ -1282,7 +1282,7 @@
   visual.frame_output_cb = old_visual->frame_output_cb;
   visual.lock_display    = NULL;
   visual.unlock_display  = NULL;
-  
+
   return xshm_open_plugin_2(class_gen, (void *)&visual);
 }
 
@@ -1327,7 +1327,7 @@
  */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
+  /* type, API, "name", version, special_info, init_function */
   { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
   { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm_2, xshm_init_class_2 },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }

diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -213,7 +213,7 @@
   frame = (xv_frame_t *) calloc(1, sizeof(xv_frame_t));
   if (!frame)
     return NULL;
-  
+
   pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 
   /*
@@ -230,7 +230,7 @@
 
 static int HandleXError (Display *display, XErrorEvent *xevent) {
   char str [1024];
-  
+
   XGetErrorText (display, xevent->error_code, str, 1024);
   printf ("received X error event: %s\n", str);
   gX11Fail = 1;
@@ -305,7 +305,7 @@
     lprintf( "XvImage height %d\n", image->height );
     lprintf( "XvImage data_size %d\n", image->data_size );
     lprintf( "XvImage num_planes %d\n", image->num_planes );
-    
+
         for( q=0; q < image->num_planes; q++)
         {
             lprintf( "XvImage pitches[%d] %d\n",  q, image->pitches[q] );
@@ -424,10 +424,10 @@
       shminfo->shmid = -1;
     }
 
-  } 
+  }
   else {
     free (myimage->data);
-    
+
     XFree (myimage);
   }
 }
@@ -465,7 +465,7 @@
     if(format == XINE_IMGFMT_YUY2) {
       frame->vo_frame.pitches[0] = frame->image->pitches[0];
       frame->vo_frame.base[0] = frame->image->data + frame->image->offsets[0];
-    } 
+    }
     else {
       frame->vo_frame.pitches[0] = frame->image->pitches[0];
       frame->vo_frame.pitches[1] = frame->image->pitches[2];
@@ -506,12 +506,12 @@
 		    this->sc.output_xoffset, this->sc.output_yoffset,
 		    this->sc.output_width, this->sc.output_height);
   }
-  
+
   if (this->xoverlay) {
     x11osd_resize (this->xoverlay, this->sc.gui_width, this->sc.gui_height);
     this->ovl_changed = 1;
   }
-  
+
   UNLOCK_DISPLAY(this);
 }
 
@@ -534,7 +534,7 @@
   _x_vo_scale_compute_output_size( &this->sc );
 }
 
-static void xv_overlay_begin (vo_driver_t *this_gen, 
+static void xv_overlay_begin (vo_driver_t *this_gen,
 			      vo_frame_t *frame_gen, int changed) {
   xv_driver_t  *this = (xv_driver_t *) this_gen;
 
@@ -542,10 +542,10 @@
 
   if( this->ovl_changed && this->xoverlay ) {
     LOCK_DISPLAY(this);
-    x11osd_clear(this->xoverlay); 
+    x11osd_clear(this->xoverlay);
     UNLOCK_DISPLAY(this);
   }
-  
+
   this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
   this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
 }
@@ -562,7 +562,7 @@
   this->ovl_changed = 0;
 }
 
-static void xv_overlay_blend (vo_driver_t *this_gen, 
+static void xv_overlay_blend (vo_driver_t *this_gen,
 			      vo_frame_t *frame_gen, vo_overlay_t *overlay) {
   xv_driver_t  *this = (xv_driver_t *) this_gen;
   xv_frame_t   *frame = (xv_frame_t *) frame_gen;
@@ -571,16 +571,16 @@
     if( overlay->unscaled ) {
       if( this->ovl_changed && this->xoverlay ) {
         LOCK_DISPLAY(this);
-        x11osd_blend(this->xoverlay, overlay); 
+        x11osd_blend(this->xoverlay, overlay);
         UNLOCK_DISPLAY(this);
       }
     } else {
       if (frame->format == XINE_IMGFMT_YV12)
-        _x_blend_yuv(frame->vo_frame.base, overlay, 
+        _x_blend_yuv(frame->vo_frame.base, overlay,
 		  frame->width, frame->height, frame->vo_frame.pitches,
                   &this->alphablend_extra_data);
       else
-        _x_blend_yuy2(frame->vo_frame.base[0], overlay, 
+        _x_blend_yuy2(frame->vo_frame.base[0], overlay,
 		   frame->width, frame->height, frame->vo_frame.pitches[0],
                    &this->alphablend_extra_data);
     }
@@ -624,7 +624,7 @@
     this->sc.delivered_height = this->cur_frame->height;
     this->sc.delivered_width  = this->cur_frame->width;
     this->sc.delivered_ratio  = this->cur_frame->ratio;
-    
+
     this->sc.crop_left        = this->cur_frame->vo_frame.crop_left;
     this->sc.crop_right       = this->cur_frame->vo_frame.crop_right;
     this->sc.crop_top         = this->cur_frame->vo_frame.crop_top;
@@ -663,7 +663,7 @@
[... 125 lines omitted ...]
   for (i = 0; i < formats; i++)
     if ((formatValues[i].id == XINE_IMGFMT_YV12) &&
 	(! (strcmp (formatValues[i].guid, "YV12")))) {
@@ -1042,7 +1042,7 @@
   int          int_default;
   cfg_entry_t *entry;
   const char  *str_prop = attr.name;
-   
+
   /*
    * some Xv drivers (Gatos ATI) report some ~0 as max values, this is confusing.
    */
@@ -1063,7 +1063,7 @@
   /* might be overridden using config entry */
   if(strcmp(str_prop, "XV_AUTOPAINT_COLORKEY") == 0)
     int_default = 0;
-    
+
   if (config_name) {
     /* is this a boolean property ? */
     if ((attr.min_value == 0) && (attr.max_value == 1)) {
@@ -1080,12 +1080,12 @@
 
     entry = this->config->lookup_entry (this->config, config_name);
 
-    if((entry->num_value < this->props[property].min) || 
+    if((entry->num_value < this->props[property].min) ||
        (entry->num_value > this->props[property].max)) {
 
-      this->config->update_num(this->config, config_name, 
+      this->config->update_num(this->config, config_name,
 			       ((this->props[property].min + this->props[property].max) >> 1));
-      
+
       entry = this->config->lookup_entry (this->config, config_name);
     }
 
@@ -1215,7 +1215,7 @@
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->display           = visual->display;
   this->screen            = visual->screen;
   this->config            = config;
@@ -1278,19 +1278,19 @@
 	    _("%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 	      "\tLooks like your graphics hardware driver doesn't support Xv?!\n"),
 	    LOG_MODULE);
-    
+
     /* XvFreeAdaptorInfo (adaptor_info); this crashed on me (gb)*/
     UNLOCK_DISPLAY(this);
     return NULL;
-  } 
+  }
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %ld from adaptor %s for hardware "
 	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             adaptor_info[adaptor_num].name);
-  
+
   UNLOCK_DISPLAY(this);
-  
+
   this->xv_port           = xv_port;
 
   _x_vo_scale_init (&this->sc, 1, 0, config );
@@ -1363,7 +1363,7 @@
 	const char *const name = attr[k].name;
 	/* store initial port attribute value */
 	xv_store_port_attribute(this, name);
-	
+
 	if(!strcmp(name, "XV_HUE")) {
 	  if (!strncmp(adaptor_info[adaptor_num].name, "NV", 2)) {
             xprintf (this->xine, XINE_VERBOSITY_NONE, LOG_MODULE ": ignoring broken XV_HUE settings on NVidia cards\n");
@@ -1417,7 +1417,7 @@
 	} else if(((this->sync_is_vsync = 0), !strcmp(name, sync_atoms[0])) ||
 		  ((this->sync_is_vsync = 1), !strcmp(name, sync_atoms[1]))) {
 	  int xv_sync_to_vblank;
-	  xv_sync_to_vblank = 
+	  xv_sync_to_vblank =
 	    config->register_bool (config, "video.device.xv_sync_to_vblank", 1,
 	      _("enable vblank sync"),
 	      _("This option will synchronize the update of the video image to the "
@@ -1448,10 +1448,10 @@
 
   fo = XvListImageFormats(this->display, this->xv_port, (int*)&formats);
   UNLOCK_DISPLAY(this);
-  
+
   this->xv_format_yv12 = 0;
   this->xv_format_yuy2 = 0;
-  
+
   for(i = 0; i < formats; i++) {
     lprintf ("Xv image format: 0x%x (%4.4s) %s\n",
 	     fo[i].id, (char*)&fo[i].id,
@@ -1467,7 +1467,7 @@
     case XINE_IMGFMT_YUY2:
       this->xv_format_yuy2 = fo[i].id;
       this->capabilities |= VO_CAP_YUY2;
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: this adaptor supports the %s format.\n"), LOG_MODULE, "YUY2");
       break;
     default:
@@ -1491,7 +1491,7 @@
   dispose_ximage (this, &myshminfo, myimage);
   UNLOCK_DISPLAY(this);
 
-  this->use_pitch_alignment = 
+  this->use_pitch_alignment =
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
 			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xv_update_xv_pitch_alignment, this);
@@ -1527,7 +1527,7 @@
   visual.frame_output_cb = old_visual->frame_output_cb;
   visual.lock_display    = NULL;
   visual.unlock_display  = NULL;
-  
+
   return open_plugin_2(class_gen, (void *)&visual);
 }
 

diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -90,7 +90,7 @@
   XvMCMacroBlock      *macroblockbaseptr; /* pointer to base MacroBlock in MB array */
   XvMCMacroBlockArray *macro_blocks;      /* pointer to memory for macroblock array */
   int                  slices;
-} xvmc_macroblocks_t;  
+} xvmc_macroblocks_t;
 
 typedef struct {
   void *xid;
@@ -146,8 +146,8 @@
   int                  max_surface_height;
   int                  num_frame_buffers;
 
-  int                  surface_width;   
-  int                  surface_height;     
+  int                  surface_width;
+  int                  surface_height;
   int                  surface_ratio;
   int                  surface_format;
   int                  surface_flags;
@@ -165,7 +165,7 @@
   /* display anatomy */
   double               display_ratio;        /* given by visual parameter
 						from init function            */
-  
+
   xvmc_property_t      props[VO_NUM_PROPERTIES];
   uint32_t             capabilities;
 
@@ -178,7 +178,7 @@
 
   /* size / aspect ratio calculations */
 
-  /* 
+  /*
    * "delivered" size:
    * frame dimension / aspect as delivered by the decoder
    * used (among other things) to detect frame size changes
@@ -186,7 +186,7 @@
 
   int                  delivered_duration;
 
-  /* 
+  /*
    * "ideal" size :
    * displayed width/height corrected by aspect ratio
    */
@@ -195,13 +195,13 @@
 						height = width * ratio_factor  */
 
   /* gui callback */
-  
+
   void               (*frame_output_cb) (void *user_data,
 					 int video_width, int video_height,
-					 int *dest_x, int *dest_y, 
+					 int *dest_x, int *dest_y,
 					 int *dest_height, int *dest_width,
 					 int *win_x, int *win_y);
-  
+
   int                  use_colorkey;
   uint32_t             colorkey;
 
@@ -237,19 +237,19 @@
 
 /**************************************************************************/
 
-/* 
+/*
  * dmvector: differential motion vector
  * mvx, mvy: decoded mv components (always in field format)
  */
-static void calc_DMV(int DMV[][2], int *dmvector, 
+static void calc_DMV(int DMV[][2], int *dmvector,
 		     int mvx, int mvy, int picture_structure, int top_field_first) {
-  
+
   if (picture_structure==VO_BOTH_FIELDS) {
     if (top_field_first) {
       /* vector for prediction of top field from bottom field */
       DMV[0][0] = ((mvx  +(mvx>0))>>1) + dmvector[0];
       DMV[0][1] = ((mvy  +(mvy>0))>>1) + dmvector[1] - 1;
-      
+
       /* vector for prediction of bottom field from top field */
       DMV[1][0] = ((3*mvx+(mvx>0))>>1) + dmvector[0];
       DMV[1][1] = ((3*mvy+(mvy>0))>>1) + dmvector[1] + 1;
@@ -258,7 +258,7 @@
       /* vector for prediction of top field from bottom field */
       DMV[0][0] = ((3*mvx+(mvx>0))>>1) + dmvector[0];
       DMV[0][1] = ((3*mvy+(mvy>0))>>1) + dmvector[1] - 1;
-      
+
       /* vector for prediction of bottom field from top field */
       DMV[1][0] = ((mvx  +(mvx>0))>>1) + dmvector[0];
       DMV[1][1] = ((mvy  +(mvy>0))>>1) + dmvector[1] + 1;
@@ -268,7 +268,7 @@
     /* vector for prediction from field of opposite 'parity' */
     DMV[0][0] = ((mvx+(mvx>0))>>1) + dmvector[0];
     DMV[0][1] = ((mvy+(mvy>0))>>1) + dmvector[1];
-    
+
     /* correct for vertical field shift */
     if (picture_structure==VO_TOP_FIELD)
       DMV[0][1]--;
@@ -277,11 +277,11 @@
   }
 }
 
-static void xvmc_proc_macro_block(int x, int y, int mb_type, int motion_type, 
-				  int (*mv_field_sel)[2], int *dmvector, int cbp, 
-				  int dct_type, vo_frame_t *current_frame, 
-				  vo_frame_t *forward_ref_frame, 
-				  vo_frame_t *backward_ref_frame, int picture_structure, 
+static void xvmc_proc_macro_block(int x, int y, int mb_type, int motion_type,
[... 630 lines omitted ...]
+
     switch (fo[i].id) {
     case XINE_IMGFMT_YV12:
       this->xvmc_format_yv12 = fo[i].id;
@@ -1475,7 +1475,7 @@
     case XINE_IMGFMT_YUY2:
       this->xvmc_format_yuy2 = fo[i].id;
       this->capabilities |= VO_CAP_YUY2;
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: this adaptor supports the %s format.\n"), LOG_MODULE, "YUY2");
       break;
     default:
@@ -1495,7 +1495,7 @@
    */
   /*
     XLockDisplay(this->display);
-    myimage = create_ximage (this, &myshminfo, 100, 100, 
+    myimage = create_ximage (this, &myshminfo, 100, 100,
                              (this->xvmc_format_yv12 != 0) ? XINE_IMGFMT_YV12 : IMGFMT_YUY2);
     dispose_ximage (this, &myshminfo, myimage);
     XUnLockDisplay(this->display);
@@ -1534,7 +1534,7 @@
   int                surface_type = 0;
 
   display = visual->display;
-  
+
   /*
    * check for Xv and  XvMC video support
    */
@@ -1575,20 +1575,20 @@
 	for(surface_num  = 0; surface_num < types; surface_num++) {
 	  if((surfaceInfo[surface_num].chroma_format == XVMC_CHROMA_FORMAT_420) &&
 	     (surfaceInfo[surface_num].mc_type == (XVMC_IDCT | XVMC_MPEG_2))) {
-	    
+
 	    max_width  = surfaceInfo[surface_num].max_width;
 	    max_height = surfaceInfo[surface_num].max_height;
-	    
+
 	    for(j = 0; j < adaptor_info[adaptor_num].num_ports; j++) {
 	      /* try to grab a port */
-	      if(Success == XvGrabPort(display, 
-				       adaptor_info[adaptor_num].base_id + j, CurrentTime)) {   
+	      if(Success == XvGrabPort(display,
+				       adaptor_info[adaptor_num].base_id + j, CurrentTime)) {
 		xv_port = adaptor_info[adaptor_num].base_id + j;
 		surface_type = surfaceInfo[surface_num].surface_type_id;
 		break;
 	      }
 	    }
-	    
+
 	    if(xv_port)
 	      break;
 	  }
@@ -1600,22 +1600,22 @@
 	  for(surface_num  = 0; surface_num < types; surface_num++) {
 	    if((surfaceInfo[surface_num].chroma_format == XVMC_CHROMA_FORMAT_420) &&
 	       ((surfaceInfo[surface_num].mc_type == (XVMC_MOCOMP | XVMC_MPEG_2)))) {
-	      
+
 	      xprintf (xine, XINE_VERBOSITY_DEBUG, "Found XVMC_MOCOMP\n");
 	      max_width = surfaceInfo[surface_num].max_width;
 	      max_height = surfaceInfo[surface_num].max_height;
 
 	      for(j = 0; j < adaptor_info[adaptor_num].num_ports; j++) {
 		/* try to grab a port */
-		if(Success == XvGrabPort(display, 
-					 adaptor_info[adaptor_num].base_id + j, CurrentTime)) {   
+		if(Success == XvGrabPort(display,
+					 adaptor_info[adaptor_num].base_id + j, CurrentTime)) {
 		  xv_port = adaptor_info[adaptor_num].base_id + j;
 		  surface_type = surfaceInfo[surface_num].surface_type_id;
 		  break;
 		}
 	      }
 
-	      if(xv_port) 
+	      if(xv_port)
 		break;
 	    }
 	  }
@@ -1623,7 +1623,7 @@
 	if(xv_port) {
 	  lprintf ("port %ld surface %d\n",xv_port,j);
 
-          IDCTaccel = 0;            
+          IDCTaccel = 0;
 	  if(surfaceInfo[surface_num].flags & XVMC_OVERLAID_SURFACE)
 	    useOverlay = 1;
 	  if(surfaceInfo[surface_num].flags & XVMC_INTRA_UNSIGNED)
@@ -1642,7 +1642,7 @@
       }
     }
   } /* outer for adaptor_num loop */
-  
+
 
   if (!xv_port) {
     xprintf (xine, XINE_VERBOSITY_LOG,
@@ -1652,13 +1652,13 @@
     /* XvFreeAdaptorInfo (adaptor_info); this crashed on me (gb)*/
     XUnlockDisplay(display);
     return NULL;
-  } 
+  }
   else {
-    xprintf (xine, XINE_VERBOSITY_LOG, 
+    xprintf (xine, XINE_VERBOSITY_LOG,
 	     _("video_out_xvmc: using Xv port %ld from adaptor %s\n"
 	       "                for hardware colour space conversion and scaling\n"),
 	     xv_port, adaptor_info[adaptor_num].name);
-    
+
     if(IDCTaccel&XINE_VO_IDCT_ACCEL)
       xprintf (xine, XINE_VERBOSITY_LOG, _("                idct and motion compensation acceleration \n"));
     else if (IDCTaccel&XINE_VO_MOTION_ACCEL)
@@ -1670,7 +1670,7 @@
   }
 
   XUnlockDisplay(display);
-  
+
   this = (xvmc_class_t *) malloc (sizeof (xvmc_class_t));
 
   if (!this)

diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -4,7 +4,7 @@
  *
  * This file is part of xine, a free video player.
  *
- * xine is free software; you can redistribute it and/or modify it 
+ * xine is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -40,7 +40,7 @@
 
 
 static int gX11Fail;
-static void xxmc_frame_updates(xxmc_driver_t *driver, xxmc_frame_t *frame, 
+static void xxmc_frame_updates(xxmc_driver_t *driver, xxmc_frame_t *frame,
 			       int init_macroblocks);
 static void dispose_ximage (xxmc_driver_t *this, XShmSegmentInfo *shminfo,
 			    XvImage *myimage);
@@ -69,7 +69,7 @@
  * Additional thread safety, since the plugin may decide to destroy a context
  * while it's surfaces are still active in the video-out loop.
  * When / If XvMC libs are reasonably thread-safe, the locks can be made
- * more efficient by allowing multiple threads in that do not destroy 
+ * more efficient by allowing multiple threads in that do not destroy
  * the context or surfaces that may be active in other threads.
  */
 
@@ -92,7 +92,7 @@
 #ifdef XVMC_THREAD_SAFE
   c->num_readers++;
   pthread_mutex_unlock(&c->mutex);
-#endif 
+#endif
 }
 
 void xvmc_context_reader_unlock(context_lock_t *c)
@@ -103,9 +103,9 @@
     if (--(c->num_readers) == 0) {
       pthread_cond_broadcast(&c->cond);
     }
-  } 
+  }
 #endif
-  pthread_mutex_unlock(&c->mutex); 
+  pthread_mutex_unlock(&c->mutex);
 }
 
 static void xvmc_context_writer_lock(context_lock_t *c)
@@ -115,7 +115,7 @@
   while(c->num_readers) {
     pthread_cond_wait(&c->cond, &c->mutex);
   }
-#endif 
+#endif
 }
 
 static void xvmc_context_writer_unlock(context_lock_t *c)
@@ -131,34 +131,34 @@
 
 
 
-static void xxmc_xvmc_dump_surfaces(xxmc_driver_t *this ) 
+static void xxmc_xvmc_dump_surfaces(xxmc_driver_t *this )
 {
   int
     i;
   xvmc_surface_handler_t *handler = &this->xvmc_surf_handler;
 
   for (i=0; i<XVMC_MAX_SURFACES; ++i) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "%d %d;",handler->surfInUse[i],  
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "%d %d;",handler->surfInUse[i],
 	    handler->surfValid[i]);
   }
-  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "\n"); 
+  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "\n");
 }
 
-static void xxmc_xvmc_dump_subpictures(xxmc_driver_t *this) 
+static void xxmc_xvmc_dump_subpictures(xxmc_driver_t *this)
 {
   int
     i;
   xvmc_surface_handler_t *handler = &this->xvmc_surf_handler;
 
   for (i=0; i<XVMC_MAX_SUBPICTURES; ++i) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "%d %d;",handler->subInUse[i],  
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "%d %d;",handler->subInUse[i],
 	    handler->subValid[i]);
   }
-  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "\n"); 
+  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "\n");
 }
 
 
-static void xxmc_xvmc_surface_handler_construct(xxmc_driver_t *this) 
+static void xxmc_xvmc_surface_handler_construct(xxmc_driver_t *this)
 {
   xvmc_surface_handler_t *handler = &this->xvmc_surf_handler;
 
@@ -208,11 +208,11 @@
   }
   pthread_mutex_unlock(&handler->mutex);
 }
-    
-static XvMCSurface *xxmc_xvmc_alloc_surface(xxmc_driver_t *this, 
+
+static XvMCSurface *xxmc_xvmc_alloc_surface(xxmc_driver_t *this,
 					    XvMCContext *context)
 {
-  xvmc_surface_handler_t *handler = &this->xvmc_surf_handler;  
+  xvmc_surface_handler_t *handler = &this->xvmc_surf_handler;
   int i;
 
   pthread_mutex_lock(&handler->mutex);
@@ -228,7 +228,7 @@
   for (i=0; i<XVMC_MAX_SURFACES; ++i) {
     if (!handler->surfInUse[i]) {
       XVMCLOCKDISPLAY( this->display );
-      if (Success != XvMCCreateSurface( this->display, context, 
+      if (Success != XvMCCreateSurface( this->display, context,
 					handler->surfaces + i)) {
 	XVMCUNLOCKDISPLAY( this->display );
 	pthread_mutex_unlock(&handler->mutex);
@@ -247,13 +247,13 @@
   return NULL;
[... 1209 lines omitted ...]
 	     LOG_MODULE ": Falling back to Xv.\n");
     XVMCUNLOCKDISPLAY( this->display );
@@ -2423,8 +2423,8 @@
   return;
 
 }
-  
-  
+
+
 
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
@@ -2445,7 +2445,7 @@
   XvAdaptorInfo        *adaptor_info;
   unsigned int          adaptor_num;
   xv_prefertype		prefer_type;
-  cfg_entry_t          *entry;     
+  cfg_entry_t          *entry;
   int                   use_more_frames;
   int                   use_unscaled;
 
@@ -2454,7 +2454,7 @@
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->display           = visual->display;
   this->screen            = visual->screen;
   this->config            = config;
@@ -2512,19 +2512,19 @@
 	    _("%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 	      "\tLooks like your graphics hardware driver doesn't support Xv?!\n"),
 	    LOG_MODULE);
-    
+
     /* XvFreeAdaptorInfo (adaptor_info); this crashed on me (gb)*/
     XUnlockDisplay(this->display);
     return NULL;
-  } 
+  }
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %ld from adaptor %s for hardware "
 	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             adaptor_info[adaptor_num].name);
-  
+
   XUnlockDisplay(this->display);
-  
+
   this->xv_port           = xv_port;
 
   _x_vo_scale_init (&this->sc, 1, 0, config );
@@ -2673,10 +2673,10 @@
 
   fo = XvListImageFormats(this->display, this->xv_port, (int*)&formats);
   XUnlockDisplay (this->display);
-  
+
   this->xv_format_yv12 = 0;
   this->xv_format_yuy2 = 0;
-  
+
   for(i = 0; i < formats; i++) {
     lprintf ("Xv image format: 0x%x (%4.4s) %s\n",
 	     fo[i].id, (char*)&fo[i].id,
@@ -2692,7 +2692,7 @@
     case XINE_IMGFMT_YUY2:
       this->xv_format_yuy2 = fo[i].id;
       this->capabilities |= VO_CAP_YUY2;
-      xprintf(this->xine, XINE_VERBOSITY_LOG, 
+      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	      _("%s: this adaptor supports the %s format.\n"), LOG_MODULE, "YUY2");
       break;
     default:
@@ -2717,19 +2717,19 @@
   dispose_ximage (this, &myshminfo, myimage);
   XUnlockDisplay (this->display);
 
-  this->use_pitch_alignment = 
+  this->use_pitch_alignment =
     config->register_bool (config, "video.device.xv_pitch_alignment", 0,
 			   VIDEO_DEVICE_XV_PITCH_ALIGNMENT_HELP,
 			   10, xxmc_update_xv_pitch_alignment, this);
 
-  use_more_frames= 
+  use_more_frames=
     config->register_bool (config, "video.device.xvmc_more_frames", 0,
 			   _("Make XvMC allocate more frames for better buffering."),
 			   _("Some XvMC implementations allow more than 8 frames.\n"
 			     "This option, when turned on, makes the driver try to\n"
 			     "allocate 15 frames. A must for unichrome and live VDR.\n"),
 			   10, NULL, this);
-  this->cpu_save_enabled = 
+  this->cpu_save_enabled =
     config->register_bool (config, "video.device.unichrome_cpu_save", 0,
 			   _("Unichrome cpu save"),
 			   _("Saves CPU time by sleeping while decoder works.\n"
@@ -2768,7 +2768,7 @@
 
 #ifdef HAVE_VLDXVMC
   printf("%s: Unichrome CPU saving is %s.\n", LOG_MODULE,
-	 (this->cpu_save_enabled) ? "on":"off"); 
+	 (this->cpu_save_enabled) ? "on":"off");
 #else
   printf("%s: warning - compiled with no vld extensions.\n", LOG_MODULE);
 #endif
@@ -2797,10 +2797,10 @@
     }
     XUnlockDisplay (this->display);
   }
-  
+
   if( this->xoverlay ) {
     this->capabilities |= VO_CAP_UNSCALED_OVERLAY;
-  } 
+  }
   return &this->vo_driver;
 }
 
@@ -2838,4 +2838,4 @@
   { PLUGIN_VIDEO_OUT, 22, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
- 
+

diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c
--- a/src/video_out/x11osd.c
+++ b/src/video_out/x11osd.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2003 the xine project
  *
  * This file is part of xine, a free video player.
@@ -96,7 +96,7 @@
   assert (osd);
 
   lprintf("expose (state:%d)\n", osd->clean );
-  
+
   switch (osd->mode) {
     case X11OSD_SHAPED:
       XShapeCombineMask (osd->display, osd->u.shaped.window, ShapeBounding, 0, 0,
@@ -106,7 +106,7 @@
 	if( !osd->u.shaped.mapped )
 	  XMapRaised (osd->display, osd->u.shaped.window);
 	osd->u.shaped.mapped = 1;
-    
+
 	XCopyArea (osd->display, osd->bitmap, osd->u.shaped.window, osd->gc, 0, 0,
 		   osd->width, osd->height, 0, 0);
       } else {
@@ -129,7 +129,7 @@
   assert (osd);
   assert (width);
   assert (height);
-  
+
   lprintf("resize old:%dx%d new:%dx%d\n", osd->width, osd->height, width, height );
 
   osd->width = width;
@@ -153,7 +153,7 @@
 		       osd->width, osd->height, osd->depth);
       break;
   }
-  
+
   osd->clean = UNDEFINED;
   x11osd_clear(osd);
 }
@@ -165,7 +165,7 @@
   XWindowAttributes getattr;
 
   assert (osd);
-  
+
   lprintf("drawable changed\n");
 
 /*
@@ -183,14 +183,14 @@
   XSync (osd->display, False);
 
   osd->window = window;
-  
+
   XGetWindowAttributes (osd->display, osd->window, &getattr);
   osd->width = getattr.width;
   osd->height = getattr.height;
-  
+
   assert(osd->width);
   assert(osd->height);
-  
+
   switch(osd->mode) {
     case X11OSD_SHAPED:
       XFreePixmap (osd->display, osd->u.shaped.mask_bitmap);
@@ -199,8 +199,8 @@
       attr.override_redirect = True;
       attr.background_pixel  = BlackPixel (osd->display, osd->screen);
       osd->u.shaped.window = XCreateWindow(osd->display, osd->window,
-                              0, 0, osd->width, osd->height, 0, 
-                              CopyFromParent, CopyFromParent, CopyFromParent, 
+                              0, 0, osd->width, osd->height, 0,
+                              CopyFromParent, CopyFromParent, CopyFromParent,
                               CWBackPixel | CWOverrideRedirect, &attr);
 
       XSelectInput (osd->display, osd->u.shaped.window, ExposureMask);
@@ -212,18 +212,18 @@
       osd->bitmap = XCreatePixmap (osd->display, osd->u.shaped.window, osd->width,
 				   osd->height, osd->depth);
 
-      osd->cmap = XCreateColormap(osd->display, osd->u.shaped.window, 
+      osd->cmap = XCreateColormap(osd->display, osd->u.shaped.window,
 				  osd->visual, AllocNone);
       break;
     case X11OSD_COLORKEY:
       osd->bitmap = XCreatePixmap (osd->display, osd->window, osd->width,
 				   osd->height, osd->depth);
-      osd->cmap = XCreateColormap(osd->display, osd->window, 
+      osd->cmap = XCreateColormap(osd->display, osd->window,
                               osd->visual, AllocNone);
 
       break;
   }
-  
+
   osd->clean = UNDEFINED;
   /* do not x11osd_clear() here: osd->u.colorkey.sc has not being updated yet */
 }
@@ -260,11 +260,11 @@
 
   osd->visual = DefaultVisual (osd->display, osd->screen);
   osd->depth = DefaultDepth (osd->display, osd->screen);
-  
+
   XGetWindowAttributes (osd->display, osd->window, &getattr);
   osd->width = getattr.width;
   osd->height = getattr.height;
-  
+
   assert(osd->width);
   assert(osd->height);
 
@@ -278,8 +278,8 @@
       attr.override_redirect = True;
       attr.background_pixel  = BlackPixel (osd->display, osd->screen);
       osd->u.shaped.window = XCreateWindow(osd->display, osd->window,
-                              0, 0, osd->width, osd->height, 0, 
-                              CopyFromParent, CopyFromParent, CopyFromParent, 
+                              0, 0, osd->width, osd->height, 0,
+                              CopyFromParent, CopyFromParent, CopyFromParent,
                               CWBackPixel | CWOverrideRedirect, &attr);
 
       XSync(osd->display, False);
@@ -288,7 +288,7 @@
 	goto error_window;
       }
 
-      osd->u.shaped.mask_bitmap = XCreatePixmap (osd->display, osd->u.shaped.window, osd->width, 
+      osd->u.shaped.mask_bitmap = XCreatePixmap (osd->display, osd->u.shaped.window, osd->width,
                    osd->height, 1);
       XSync(osd->display, False);
       if( x11_error ) {
@@ -296,7 +296,7 @@
 	goto error_aftermaskbitmap;
       }
 
-      osd->bitmap = XCreatePixmap (osd->display, osd->u.shaped.window, osd->width, 
+      osd->bitmap = XCreatePixmap (osd->display, osd->u.shaped.window, osd->width,
                    osd->height, osd->depth);
       osd->gc = XCreateGC (osd->display, osd->u.shaped.window, 0, NULL);
 
@@ -315,14 +315,14 @@
 
       XSelectInput (osd->display, osd->u.shaped.window, ExposureMask);
       osd->u.shaped.mapped = 0;
-      osd->cmap = XCreateColormap(osd->display, osd->u.shaped.window, 
+      osd->cmap = XCreateColormap(osd->display, osd->u.shaped.window,
                               osd->visual, AllocNone);
       break;
     case X11OSD_COLORKEY:
-      osd->bitmap = XCreatePixmap (osd->display, osd->window, osd->width, 
+      osd->bitmap = XCreatePixmap (osd->display, osd->window, osd->width,
                    osd->height, osd->depth);
       osd->gc = XCreateGC (osd->display, osd->window, 0, NULL);
-      osd->cmap = XCreateColormap(osd->display, osd->window, 
+      osd->cmap = XCreateColormap(osd->display, osd->window,
                               osd->visual, AllocNone);
       /* FIXME: the expose event doesn't seem to happen? */
       /*XSelectInput (osd->display, osd->window, ExposureMask);*/
@@ -342,8 +342,8 @@
 
   XSetErrorHandler(old_handler);
 
-  xprintf(osd->xine, XINE_VERBOSITY_DEBUG, 
-    _("x11osd: unscaled overlay created (%s mode).\n"), 
+  xprintf(osd->xine, XINE_VERBOSITY_DEBUG,
+    _("x11osd: unscaled overlay created (%s mode).\n"),
     (mode==X11OSD_SHAPED) ? "XShape" : "Colorkey" );
 
   return osd;
@@ -402,9 +402,9 @@
 void x11osd_clear(x11osd *osd)
 {
   int i;
-  
+
   lprintf("clear (state:%d)\n", osd->clean );
-  
+
   if( osd->clean != WIPED )
     switch (osd->mode) {
       case X11OSD_SHAPED:
@@ -442,7 +442,7 @@
 {
   if (osd->clean==UNDEFINED)
     x11osd_clear(osd);	/* Workaround. Colorkey mode needs sc data before the clear. */
-  
+
   if (overlay->rle) {
     int i, x, y, len, width;
     int use_clip_palette, max_palette_colour[2];
@@ -474,7 +474,7 @@
             if (x + width - 1 > overlay->hili_right) {
               width -= overlay->hili_right - x;
               len += overlay->hili_right - x;
-            } 
+            }
           }
         }
 
@@ -482,7 +482,7 @@
           int j;
           clut_t *src_clut;
           uint8_t *src_trans;
-          
+
           if (use_clip_palette) {
             src_clut = (clut_t *)&overlay->hili_color;
             src_trans = (uint8_t *)&overlay->hili_trans;
@@ -507,7 +507,7 @@
                 xcolor.green = (65536 * saturate(g, 0, 255)) / 256;
                 b = y + 2 * u - 274;
                 xcolor.blue = (65536 * saturate(b, 0, 255)) / 256;
-                
+
                 xcolor.flags = DoRed | DoBlue | DoGreen;
 
                 XAllocColor(osd->display, osd->cmap, &xcolor);
diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h
--- a/src/video_out/x11osd.h
+++ b/src/video_out/x11osd.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2003 the xine project
  *
  * This file is part of xine, a free video player.
diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c
--- a/src/video_out/xcbosd.c
+++ b/src/video_out/xcbosd.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2003, 2007 the xine project
  *
  * This file is part of xine, a free video player.
@@ -93,7 +93,7 @@
   assert (osd);
 
   lprintf("expose (state:%d)\n", osd->clean );
-  
+
   switch (osd->mode) {
     case XCBOSD_SHAPED:
       xcb_shape_mask(osd->connection, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING,
@@ -106,7 +106,7 @@
 	  xcb_map_window(osd->connection, osd->u.shaped.window);
 	}
 	osd->u.shaped.mapped = 1;
-    
+
 	xcb_copy_area(osd->connection, osd->bitmap, osd->u.shaped.window,
 		      osd->gc, 0, 0, 0, 0, osd->width, osd->height);
       } else {
@@ -128,7 +128,7 @@
   assert (osd);
   assert (width);
   assert (height);
-  
+
   lprintf("resize old:%dx%d new:%dx%d\n", osd->width, osd->height, width, height );
 
   osd->width = width;
@@ -151,7 +151,7 @@
       xcb_create_pixmap(osd->connection, osd->depth, osd->bitmap, osd->window, osd->width, osd->height);
       break;
   }
-  
+
   osd->clean = UNDEFINED;
   xcbosd_clear(osd);
 }
@@ -162,7 +162,7 @@
   xcb_get_geometry_reply_t *get_geometry_reply;
 
   assert (osd);
-  
+
   lprintf("drawable changed\n");
 
 /*
@@ -180,17 +180,17 @@
   /* XSync (osd->display, False); FIXME don't think that we need that --pfister */
 
   osd->window = window;
-  
+
   get_geometry_cookie = xcb_get_geometry(osd->connection, osd->window);
   get_geometry_reply = xcb_get_geometry_reply(osd->connection, get_geometry_cookie, NULL);
   osd->depth = get_geometry_reply->depth;
   osd->width = get_geometry_reply->width;
   osd->height = get_geometry_reply->height;
   free(get_geometry_reply);
-  
+
   assert(osd->width);
   asse