Merge from 1.2 main.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/xine-engine/spu.c b/src/xine-engine/spu.c
index c610a43c9..9bc1de84c 100644
--- a/src/xine-engine/spu.c
+++ b/src/xine-engine/spu.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.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -46,7 +46,7 @@ void _x_spu_misc_init (xine_t *this)
 void _x_spu_get_opacity (xine_t *this, xine_spu_opacity_t *opacity)
 {
   cfg_entry_t *entry;
-  
+
   entry = this->config->lookup_entry (this->config, "subtitles.bitmap.black_opacity");
   opacity->black = entry ? entry->num_value : BLACK_OPACITY;
   entry = this->config->lookup_entry (this->config, "subtitles.bitmap.colour_opacity");