Merge from 1.2 main branch.

57 files changed, 187 insertions, 123 deletions

diff --git a/AUTHORS b/AUTHORS
index 51f321a64..5260ba4ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,7 +76,7 @@ James Stembridge <jstembridge@users.sourceforge.net>
   VIDIX driver, real media and ffmpeg interface fixes and improvements
   mpeg-4 postprocessing, initial software DTS decoding
 
-Frantisek Dvorak <valtri@atlas.cz>
+František Dvořák <valtri@atlas.cz>
   czech translations and multilanguage support (xine lib/ui),
   RIP Input Plugin, WIN32 porting, lots of other improvements and bugfixes
 
@@ -185,7 +185,7 @@ Bastien Nocera <hadess@hadess.net>
 Philip Stadermann <pstadermann@gmx.de>
   arts audio server support, kde frontend
 
-Jérôme Villette <villette@chem.leidenuniv.nl>
+Jérôme Villette <villette@chem.leidenuniv.nl>
   'xinetic', 'CelomaGold', 'CelomaMdk', 'CelomaChrome', 'Centori' 
 and 'Keramic' skins.
 
@@ -364,7 +364,7 @@ Xavier Izard <xizard@enib.fr>
 Anders D. Wiehe <anders@wiehe.org>
   OSD stream informations patch.
 
-Zoltán Böszörményi <zboszor@freemail.hu>
+Zoltán Böszörményi <zboszor@freemail.hu>
   tremendous help in porting sputext to 1.0 API
 
 Micael Beronius <micael.beronius@telia.com>
@@ -380,10 +380,10 @@ John McCutchan <ttb@tentacle.dhs.org>
 Fredrik Noring <noring@nocrew.org>
   linux fb frontend. improved fb driver with zero copy
 
-Marco Zühlke <andruil@users.sourceforge.net>
+Marco Zühlke <andruil@users.sourceforge.net>
   visualization improvements, demuxer cleanups
 
-Julio Sánchez <j.sanchezf@terra.es>
+Julio Sánchez <j.sanchezf@terra.es>
   patch for drawing OSD bitmaps
 
 Stuart Caie <kyzer@4u.net>
@@ -422,7 +422,7 @@ Dirk Meyer <dmeyer@tzi.de
 Darren Vincent Hart <dvhart@byu.edu>
   libstk video out plugin
 
-Philip Jägenstedt <philipj@telia.com>
+Philip Jägenstedt <philipj@telia.com>
   rework of aspect ratio to support float values
 
 Laurent Aimar <fenrir@videolan.org>
@@ -437,7 +437,7 @@ Simon Truss <simon@bigblue.demon.co.uk>
 Jeroen Asselman <jeroen@asselman.com>
   v4l improvements, audio support
 
-Njål T. Borch <Njaal.Borch@njaal.net>
+Njål T. Borch <Njaal.Borch@njaal.net>
   Ipv6 patch
 
 Ramon van der Aar <rvda@itsec-ps.nl>
@@ -501,7 +501,7 @@ Vincent Pelletier <subdino2004@yahoo.fr>
 Daniel Mack <xine@zonque.org>
   native Mac OS X video and audio output plugins
 
-André Pang <ozone@algorithm.com.au>
+André Pang <ozone@algorithm.com.au>
   Mac OS X fixes and framework/frontend work
   Annodex and CMML support
 
@@ -514,7 +514,7 @@ Ryan Tadlock <pholan-xine-users@midnight.postino.com>
 Casper Boemann <cbr@boemann.dk>
   reuse stubs for unresolved exports of win32 dlls
 
-Thomas Hellström <unichrome@shipmail.org>
+Thomas Hellström <unichrome@shipmail.org>
   XxMC driver with reworked XvMC support, including VIA CLE266 vld
   extensions.
 
@@ -527,12 +527,12 @@ Sylvain Colinet <scolinet@gmail.com>
 Barry Scott <barry.scott@onelan.co.uk>
   fix V4l source selection code by MRL
 
-Reinhard Nissl <rnissl@gmx.de>
+Reinhard Nißl <rnissl@gmx.de>
   contributions for VDR interoperability, bugfixes,
   overlay blending quality improvements, audio post plugin support for xine-ui,
   upmix_mono post plugin
 
-Pekka Jääskeläinen <pjaaskel@cs.tut.fi>
+Pekka Jääskeläinen <pjaaskel@cs.tut.fi>
   DVB mouse-control and EPG enhancements
 
 Assaf Gillat <gillata@gmail.com>
@@ -547,10 +547,10 @@ Piarres Beobide <pi@beobide.net>
 Keenan Pepper <keenanpepper@gmail.com>
   gcc4 patches
 
-Dams Nadé <anvil@livna.org>
+Dams Nadé <anvil@livna.org>
   gcc4 patches
 
-Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>
+Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>
   build system improvements, LE_64/BE_64 macro fixes
 
 Jason Tackaberry <tack@sault.org>
diff --git a/ChangeLog b/ChangeLog
index 404b20e02..6e26420bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ xine-lib (1.1.7) (unreleased)
   * Ensure that the ffmpeg video image size is properly initialised.
   * Allow XxMC to switch back to software decoding; don't deinterlace if it's
     not needed for any given frame.
+  * Document dvba: MRLs (ATSC with full tuning info).
 
 xine-lib (1.1.6)
   * Split the DirectFB plugin into X11 and non-X versions.
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index f705b1b23..43768f8a1 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -54,6 +54,8 @@ to read from. Valid MRLs may be plain file names or one of the following:
 .br
 .BI dvbt://<channel_name>:<tuning_parameters>
 .br
+.BI dvba://<channel_name>:<tuning_parameters>
+.br
 .BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)"
 .LP
 .TP
@@ -199,13 +201,16 @@ For the dvbc, dvbs and dvbt MRLs, tuning parameters are expected, taking one
 of the following forms:
 .TP
 .B DVB-S
-<frequency>:<polarisation>:<sat_no>:<sym_rate>:<vpid>:<apid>
+<frequency>:<polarisation>:<sat-no>:<sym-rate>:<vpid>:<apid>:<service-id>
 .TP
 .B DVB-C
-<frequency>:<inversion>:<sym_rate>:<fec>:<qam>:<vpid>:<apid>
+<frequency>:<inversion>:<sym-rate>:<fec>:<qam>:<vpid>:<apid>:<service-id>
 .TP
 .B DVB-T
-<frequency>:<inversion>:<bw>:<fec_hp>:<fec_lp>:<qam>:<transmission_mode>:<guardlist>:<hierarchy_info>:<vpid>:<apid>
+<frequency>:<inversion>:<bw>:<fec-hp>:<fec-lp>:<qam>:<transmission-mode>:<guardlist>:<hierarchy-info>:<vpid>:<apid>:<service-id>
+.TP
+.B DVB-A
+<frequency>:<qam>:<vpid>:<apid>:<service-id>
 .PP
 The individual parameters are:
 .TP 20
@@ -215,16 +220,16 @@ number, usually in kHz
 .B polarisation
 `v' or `h'
 .TP 20
-.B sat_no
+.B sat-no
 unsigned long, usually 0
 .TP 20
-.B sym_rate
+.B sym-rate
 symbol rate in MSyms/sec
 .TP 20
 .B inversion
 INVERSION_ON, INVERSION_OFF, INVERSION_AUTO
 .TP 20
-.B fec, fec_hp, fec_lp
+.B fec, fec-hp, fec-lp
 FEC_1_2, FEC_2_3, FEC_3_4 ... FEC_8_9, FEC_AUTO, FEC_NONE
 .TP 20
 .B qam
@@ -233,13 +238,13 @@ QPSK, QAM_128, QAM_16 ...
 .B bw
 BANDWIDTH_6_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_8_MHZ
 .TP 20
-.B transmission_mode
+.B transmission-mode
 TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K
 .TP 20
 .B guardlist
 GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_32,
 .TP 20
-.B hierarchy_info
+.B hierarchy-info
 HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_NONE
 .TP 20
 .B vpid
@@ -247,6 +252,9 @@ video program ID
 .TP 20
 .B apid
 audio program ID
+.TP 20
+.B service-id
+service ID (needed for now/next information etc.)
 .SH SUBTITLE
 .B external subtitle files (any mrl)
 .br
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 83b2d982c..b40c7d49f 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -337,7 +337,6 @@ typedef struct {
   int32_t packet_number;
   /* NEW: var to keep track of number of last read packets */
   int32_t npkt_read;
-  int32_t read_zero;
 
   uint8_t buf[BUF_SIZE]; /* == PKT_SIZE * NPKT_PER_READ */
 
@@ -683,7 +682,11 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m,
   stream_id  = p[3];
 
   if (packet_len==0)
+  {
+    xprintf (xine, XINE_VERBOSITY_DEBUG,
+             "demux_ts: error pes length 0\n");
     return 0;
+  }
 
 #ifdef TS_LOG
   printf ("demux_ts: packet stream id: %.2x len: %d (%x)\n",
@@ -1244,7 +1247,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
     case ISO_14496_PART10_VIDEO:
       if (this->videoPid == INVALID_PID) {
 #ifdef TS_PMT_LOG
-        printf ("demux_ts: PMT video pid 0x%.4x\n", pid);
+        printf ("demux_ts: PMT video pid 0x%.4x type %2.2x\n", pid, stream[0]);
 #endif
         demux_ts_pes_new(this, this->media_num, pid, this->video_fifo,stream[0]);
 	this->videoMedia = this->media_num;
@@ -1266,7 +1269,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
         }
         if(!found) {
 #ifdef TS_PMT_LOG
-            printf ("demux_ts: PMT audio pid 0x%.4x\n", pid);
+            printf ("demux_ts: PMT audio pid 0x%.4x type %2.2x\n", pid, stream[0]);
 #endif
             demux_ts_pes_new(this, this->media_num, pid, this->audio_fifo,stream[0]);
             this->audio_tracks[this->audio_tracks_count].pid = pid;
@@ -1280,7 +1283,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
       break;
     case ISO_13818_PRIVATE:
 #ifdef TS_PMT_LOG
-      printf ("demux_ts: PMT streamtype 13818_PRIVATE, pid: 0x%.4x\n", pid);
+      printf ("demux_ts: PMT streamtype 13818_PRIVATE, pid: 0x%.4x type %2.2x\n", pid, stream[0]);
 
       for (i = 5; i < coded_length; i++)
         printf ("%.2x ", stream[i]);
@@ -1289,7 +1292,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
       break;
     case  ISO_13818_TYPE_C: /* data carousel */
 #ifdef TS_PMT_LOG
-      printf ("demux_ts: PMT streamtype 13818_TYPE_C, pid: 0x%.4x\n", pid);
+      printf ("demux_ts: PMT streamtype 13818_TYPE_C, pid: 0x%.4x type %2.2x\n", pid, stream[0]);
 #endif
       break;
     case ISO_13818_PES_PRIVATE:
@@ -1305,7 +1308,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
 	  }
           if(!found) {
 #ifdef TS_PMT_LOG
-            printf ("demux_ts: PMT AC3 audio pid 0x%.4x\n", pid);
+            printf ("demux_ts: PMT AC3 audio pid 0x%.4x type %2.2x\n", pid, stream[0]);
 #endif
           demux_ts_pes_new(this, this->media_num, pid,
                            this->audio_fifo, 0x81);
@@ -1323,7 +1326,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
         else if (stream[i] == 0x56)
           {
 #ifdef TS_PMT_LOG
-            printf ("demux_ts: PMT Teletext, pid: 0x%.4x\n", pid);
+            printf ("demux_ts: PMT Teletext, pid: 0x%.4x type %2.2x\n", pid, stream[0]);
 
             for (i = 5; i < coded_length; i++)
               printf ("%.2x ", stream[i]);
@@ -1358,10 +1361,11 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num
 				 pid, this->video_fifo,
 				 stream[0]);
 #ifdef TS_LOG
-		printf("demux_ts: DVBSUB: pid 0x%.4x: %s  page %ld %ld\n",
+		printf("demux_ts: DVBSUB: pid 0x%.4x: %s  page %ld %ld type %2.2x\n",
 		       pid, lang->desc.lang,
 		       lang->desc.comp_page_id,
-		       lang->desc.aux_page_id);
+		       lang->desc.aux_page_id,
+                       stream[0]);
 #endif
 	      }
 	  }
@@ -1531,12 +1535,7 @@ static unsigned char * demux_synchronise(demux_ts_t* this) {
        */
 
       if (this->npkt_read == 0) {
-	/* printf ("demux_ts: read 0 packets! (%d)\n", this->read_zero); */
-	this->read_zero++;
-      } else this->read_zero = 0;
-
-      if (this->read_zero > 200) {
-	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets too many times!\n");
+	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets\n");
 	this->status = DEMUX_FINISHED;
 	return NULL;
       }
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index fd2c5f570..efc3a88d8 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -27,7 +27,7 @@
  * Date        Author
  * ----        ------
  *
- * 01-Feb-2005 Pekka Jääskeläinen <poj@iki.fi>
+ * 01-Feb-2005 Pekka Jääskeläinen <poj@iki.fi>
  *
  *             - This history log started.
  *             - Disabled the automatic EPG updater thread until EPG demuxer 
@@ -111,6 +111,7 @@
 #define LOG_VERBOSE
 /*
 #define LOG
+#define LOG_READS
 */
 
 #include "xine_internal.h"
@@ -589,7 +590,8 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
     this = (tuner_t *) xine_xmalloc(sizeof(tuner_t));
 
     _x_assert(this != NULL);
-    
+
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "tuner_init adapter=%d\n", adapter);
     this->fd_frontend = -1;
     for (x = 0; x < MAX_FILTERS; x++)
       this->fd_pidfilter[x] = 0;
@@ -634,7 +636,7 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
      xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno));
     /* and the internal filter used for PAT & PMT */
    if(fcntl(this->fd_pidfilter[INTERNAL_FILTER], F_SETFL, O_NONBLOCK)<0)
-     xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno));
+     xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set INTERNAL to nonblock: %s\n",strerror(errno));
     /* and the frontend */
     fcntl(this->fd_frontend, F_SETFL, O_NONBLOCK);
    
@@ -1010,7 +1012,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters
   while (ioctl(this->fd_frontend, FE_GET_EVENT, &event) != -1);
 
   if (ioctl(this->fd_frontend, FE_SET_FRONTEND, front_param) <0) {
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "setfront front: %s\n", strerror(errno));
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: setfront front: %s\n", strerror(errno));
     return 0;
   }
 
@@ -1036,7 +1038,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters
   do {
     status = 0;
     if (ioctl(this->fd_frontend, FE_READ_STATUS, &status) < 0) {
-      xprintf(this->xine, XINE_VERBOSITY_DEBUG, "fe get event: %s\n", strerror(errno));
+      xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: fe get event: %s\n", strerror(errno));
       return 0;
     }
 
@@ -2476,8 +2478,10 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen,
   if (!this->tuned_in)
       return 0;
   dvb_event_handler (this);
+#ifdef LOG_READS
   xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,
 	  "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len);
+#endif
 
 #ifndef DVB_NO_BUFFERING
   nbc_check_buffers (this->nbc); 
@@ -2529,9 +2533,11 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen,
 	      break;
 	  } 
 
+#ifdef LOG_READS
       xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,
 	      "input_dvb: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", 
 	      (intmax_t)n, (intmax_t)total, (intmax_t)len);
+#endif
     
       if (n > 0){  
 	  this->curpos += n;
@@ -2905,13 +2911,13 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
     {
       fprintf(stderr,"input_dvb: 2a %x\n",tuner->feinfo.type); 
       /*
-       * This is dvbc://<channel name>:<qam tuning parameters>
+       * This is dvba://<channel name>:<atsc tuning parameters>
        */
        if (tuner->feinfo.type != FE_ATSC) 
        {
 	 fprintf(stderr,"input_dvb: FAILED 1\n"); 
          xprintf(this->class->xine, XINE_VERBOSITY_LOG,
-	 _("input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-C)\n"));
+	 _("input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-A)\n"));
          tuner_dispose(tuner);
          return 0;
       }
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 6b7ae9158..6e8932700 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -829,7 +829,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
 		    _("input_http: http status not 2xx: >%d %s<\n"),
 		                        httpcode, httpstatus);
 	  return -7;
-	} else if (httpcode == 403) {
+	} else if (httpcode == 403 || httpcode == 401) {
           _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
 	  xine_log (this->stream->xine, XINE_LOG_MSG,
 		    _("input_http: http status not 2xx: >%d %s<\n"),
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 370dc6a71..11e1303e7 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -115,6 +115,8 @@ struct input_plugin_s {
 
   /*
    * read nlen bytes, return number of bytes read
+   * Should block until some bytes available for read;
+   * a return value of 0 indicates no data available
    */
   off_t (*read) (input_plugin_t *this, char *buf, off_t nlen);
 
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 17c4223a2..6829470ff 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -517,11 +517,9 @@ static int extract_mrl(v4l_input_plugin_t *this, char *mrl)
     
     /* Get frequency, if available */  
     sscanf(locator, "/%d", &frequency);
-    lprintf("Tuner name: '%s' freq: %d\n", tuner_name, frequency);
-  } else {
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-            "input_v4l: No tuner name given. Expected syntax: v4l:/tuner/frequency\n" 
-            "input_v4l: Using currently tuned settings\n");
+    
+    /* cannot use xprintf to log in this routine */
+    lprintf("input_v4l: Tuner name: %s frequency %d\n", tuner_name, frequency );
   }
   
   this->frequency  = frequency;
diff --git a/src/input/libdvdnav/bswap.h b/src/input/libdvdnav/bswap.h
index c1fc7a045..36543fba5 100644
--- a/src/input/libdvdnav/bswap.h
+++ b/src/input/libdvdnav/bswap.h
@@ -3,7 +3,7 @@
 
 /*
  * Copyright (C) 2000, 2001 Billy Biggs <vektor@dumbterm.net>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
+ *                          HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 270a565ac..0a2d0c3cb 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
+ * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
  *               2002-2004 the dvdnav project
  * 
  * This file is part of libdvdnav, a DVD navigation library. It is modified
diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h
index 2a9e455c8..13768a70e 100644
--- a/src/input/libdvdnav/decoder.h
+++ b/src/input/libdvdnav/decoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
+ * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
  * 
  * This file is part of libdvdnav, a DVD navigation library. It is modified
  * from a file originally part of the Ogle DVD player.
diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c
index 6b7bcaeab..7b35f5eef 100644
--- a/src/input/libdvdnav/dvd_input.c
+++ b/src/input/libdvdnav/dvd_input.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002 Samuel Hocevar <sam@zoy.org>,
- *                    Håkan Hjort <d95hjort@dtek.chalmers.se>
+ *                    HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/dvd_input.h b/src/input/libdvdnav/dvd_input.h
index c75de9656..dacf886d8 100644
--- a/src/input/libdvdnav/dvd_input.h
+++ b/src/input/libdvdnav/dvd_input.h
@@ -3,7 +3,7 @@
 
 /*
  * Copyright (C) 2001, 2002 Samuel Hocevar <sam@zoy.org>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
+ *                          HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 7ecd8f1ba..1cf493ef1 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2004 Billy Biggs <vektor@dumbterm.net>,
- *                         Håkan Hjort <d95hjort@dtek.chalmers.se>,
- *                         Björn Englund <d4bjorn@dtek.chalmers.se>
+ *                         HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>,
+ *                         Björn Englund <d4bjorn@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h
index abaa882d0..bb3f5053b 100644
--- a/src/input/libdvdnav/dvd_reader.h
+++ b/src/input/libdvdnav/dvd_reader.h
@@ -3,8 +3,8 @@
 
 /*
  * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>,
- *                          Björn Englund <d4bjorn@dtek.chalmers.se>
+ *                          HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>,
+ *                          Björn Englund <d4bjorn@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/dvd_types.h b/src/input/libdvdnav/dvd_types.h
index e942bf79f..17c437712 100644
--- a/src/input/libdvdnav/dvd_types.h
+++ b/src/input/libdvdnav/dvd_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Björn Englund, Håkan Hjort
+ * Copyright (C) 2000, 2001 Björn Englund, Håkan Hjort
  *
  * This file is part of libdvdnav, a DVD navigation library. It is a modified
  * file originally part of the Ogle DVD player project.
diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c
index 88045b8f3..8df1d133d 100644
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -4,7 +4,7 @@
  *
  * Modifications by:
  *   Billy Biggs <vektor@dumbterm.net>.
- *   Björn Englund <d4bjorn@dtek.chalmers.se>.
+ *   Björn Englund <d4bjorn@dtek.chalmers.se>.
  *
  * dvdudf: parse and read the UDF volume information of a DVD Video
  * Copyright (C) 1999 Christian Wolff for convergence integrated media
diff --git a/src/input/libdvdnav/dvd_udf.h b/src/input/libdvdnav/dvd_udf.h
index d7b2ab601..e0725e6f4 100644
--- a/src/input/libdvdnav/dvd_udf.h
+++ b/src/input/libdvdnav/dvd_udf.h
@@ -7,7 +7,7 @@
  *
  * Modifications by:
  *   Billy Biggs <vektor@dumbterm.net>.
- *   Björn Englund <d4bjorn@dtek.chalmers.se>.
+ *   Björn Englund <d4bjorn@dtek.chalmers.se>.
  * 
  * dvdudf: parse and read the UDF volume information of a DVD Video
  * Copyright (C) 1999 Christian Wolff for convergence integrated media
diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c
index afc86b196..8f47d2a54 100644
--- a/src/input/libdvdnav/ifo_read.c
+++ b/src/input/libdvdnav/ifo_read.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003
- *               Björn Englund <d4bjorn@dtek.chalmers.se>, 
- *               Håkan Hjort <d95hjort@dtek.chalmers.se>
+ *               Björn Englund <d4bjorn@dtek.chalmers.se>, 
+ *               HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/ifo_read.h b/src/input/libdvdnav/ifo_read.h
index 3b9b27f20..5a4c513ec 100644
--- a/src/input/libdvdnav/ifo_read.h
+++ b/src/input/libdvdnav/ifo_read.h
@@ -2,8 +2,8 @@
 #define IFO_READ_H_INCLUDED
 
 /*
- * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>,
- *                                Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>,
+ *                                HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/ifo_types.h b/src/input/libdvdnav/ifo_types.h
index e9332ecec..0935f75d0 100644
--- a/src/input/libdvdnav/ifo_types.h
+++ b/src/input/libdvdnav/ifo_types.h
@@ -2,8 +2,8 @@
 #define IFO_TYPES_H_INCLUDED
 
 /*
- * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
+ *                          HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/nav_print.c b/src/input/libdvdnav/nav_print.c
index 5052deef9..14e14f373 100644
--- a/src/input/libdvdnav/nav_print.c
+++ b/src/input/libdvdnav/nav_print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * Much of the contents in this file is based on VOBDUMP.
  *
diff --git a/src/input/libdvdnav/nav_print.h b/src/input/libdvdnav/nav_print.h
index 35d4b09f0..056603e8d 100644
--- a/src/input/libdvdnav/nav_print.h
+++ b/src/input/libdvdnav/nav_print.h
@@ -3,7 +3,7 @@
 
 /*
  * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
+ *                          HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/nav_read.c b/src/input/libdvdnav/nav_read.c
index 421678c78..1c57e2d52 100644
--- a/src/input/libdvdnav/nav_read.c
+++ b/src/input/libdvdnav/nav_read.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * 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
diff --git a/src/input/libdvdnav/nav_read.h b/src/input/libdvdnav/nav_read.h
index 2f41c920d..4aa9d3c15 100644
--- a/src/input/libdvdnav/nav_read.h
+++ b/src/input/libdvdnav/nav_read.h
@@ -2,7 +2,7 @@
 #define NAV_READ_H_INCLUDED
 
 /*
- * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>.
+ * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>.
  *
  * 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
diff --git a/src/input/libdvdnav/nav_types.h b/src/input/libdvdnav/nav_types.h
index cadcdeb5d..8cf745025 100644
--- a/src/input/libdvdnav/nav_types.h
+++ b/src/input/libdvdnav/nav_types.h
@@ -2,7 +2,7 @@
 #define NAV_TYPES_H_INCLUDED
 
 /*
- * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * The data structures in this file should represent the layout of the
  * pci and dsi packets as they are stored in the stream.  Information
diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c
index 68d8062f3..6c01d14e8 100644
--- a/src/input/libdvdnav/vm.c
+++ b/src/input/libdvdnav/vm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Håkan Hjort
+ * Copyright (C) 2000, 2001 HÃ¥kan Hjort
  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
  *               2002-2004 the dvdnav project
  * 
diff --git a/src/input/libdvdnav/vm.h b/src/input/libdvdnav/vm.h
index 07c822d13..214570254 100644
--- a/src/input/libdvdnav/vm.h
+++ b/src/input/libdvdnav/vm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Håkan Hjort
+ * Copyright (C) 2000, 2001 HÃ¥kan Hjort
  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
  * 
  * This file is part of libdvdnav, a DVD navigation library. It is modified
diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c
index 30f32576f..3e0a5fb55 100644
--- a/src/input/libdvdnav/vmcmd.c
+++ b/src/input/libdvdnav/vmcmd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
+ * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
  *               2002-2004 the dvdnav project
  * 
  * This file is part of libdvdnav, a DVD navigation library. It is modified
diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h
index 13e1261be..d3fd53ec2 100644
--- a/src/input/libdvdnav/vmcmd.h
+++ b/src/input/libdvdnav/vmcmd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
+ * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort
  * 
  * This file is part of libdvdnav, a DVD navigation library. It is modified
  * from a file originally part of the Ogle DVD player.
diff --git a/src/input/vcd/libcdio/cdio/cd_types.h b/src/input/vcd/libcdio/cdio/cd_types.h
index b03cc9f72..9f4a73f67 100644
--- a/src/input/vcd/libcdio/cdio/cd_types.h
+++ b/src/input/vcd/libcdio/cdio/cd_types.h
@@ -3,7 +3,7 @@
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1996,1997,1998  Gerd Knorr <kraxel@bytesex.org>
-         and       Heiko Eißfeldt <heiko@hexco.de>
+         and       Heiko Eißfeldt <heiko@hexco.de>
 
     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
diff --git a/src/libfaad/mdct.c b/src/libfaad/mdct.c
index cd873a6f9..0df3d6aae 100644
--- a/src/libfaad/mdct.c
+++ b/src/libfaad/mdct.c
@@ -33,7 +33,7 @@
  * As described in:
  *  P. Duhamel, Y. Mahieux, and J.P. Petit, "A Fast Algorithm for the
  *  Implementation of Filter Banks Based on 'Time Domain Aliasing
- *  Cancellation’," IEEE Proc. on ICASSP‘91, 1991, pp. 2209-2212.
+ *  Cancellation'," IEEE Proc. on ICASSP'91, 1991, pp. 2209-2212.
  *
  *
  * As of April 6th 2002 completely rewritten.
diff --git a/src/libfaad/syntax.c b/src/libfaad/syntax.c
index a32988177..6dc9fc57d 100644
--- a/src/libfaad/syntax.c
+++ b/src/libfaad/syntax.c
@@ -2048,11 +2048,11 @@ static uint16_t extension_payload(bitfile *ld, drc_info *drc, uint16_t count)
         return n;
     case EXT_FILL_DATA:
         /* fill_nibble = */ faad_getbits(ld, 4
-            DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be ‘0000’ */
+            DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be '0000' */
         for (i = 0; i < count-1; i++)
         {
             /* fill_byte[i] = */ faad_getbits(ld, 8
-                DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be ‘10100101’ */
+                DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be '10100101' */
         }
         return count;
     case EXT_DATA_ELEMENT:
diff --git a/src/libmpeg2/idct_mlib.c b/src/libmpeg2/idct_mlib.c
index bb1aad9a8..e573c9790 100644
--- a/src/libmpeg2/idct_mlib.c
+++ b/src/libmpeg2/idct_mlib.c
@@ -1,6 +1,6 @@
 /*
  * idct_mlib.c
- * Copyright (C) 1999-2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 1999-2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.
diff --git a/src/libmpeg2/idct_mlib.h b/src/libmpeg2/idct_mlib.h
index 4a5b92919..1fb0787dd 100644
--- a/src/libmpeg2/idct_mlib.h
+++ b/src/libmpeg2/idct_mlib.h
@@ -1,7 +1,7 @@
 /*
  * idct_mlib.h
  *
- * Copyright (C) 1999, Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 1999, HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  *	
diff --git a/src/libmpeg2/motion_comp_mlib.c b/src/libmpeg2/motion_comp_mlib.c
index eaf27d9f2..1a37070ae 100644
--- a/src/libmpeg2/motion_comp_mlib.c
+++ b/src/libmpeg2/motion_comp_mlib.c
@@ -1,6 +1,6 @@
 /*
  * motion_comp_mlib.c
- * Copyright (C) 2000-2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000-2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.
diff --git a/src/libmpeg2new/libmpeg2/idct_mlib.c b/src/libmpeg2new/libmpeg2/idct_mlib.c
index e8f321a83..55a2e9b64 100644
--- a/src/libmpeg2new/libmpeg2/idct_mlib.c
+++ b/src/libmpeg2new/libmpeg2/idct_mlib.c
@@ -1,6 +1,6 @@
 /*
  * idct_mlib.c
- * Copyright (C) 1999-2003 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 1999-2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_mlib.c b/src/libmpeg2new/libmpeg2/motion_comp_mlib.c
index 96f000991..71c085029 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_mlib.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_mlib.c
@@ -1,6 +1,6 @@
 /*
  * motion_comp_mlib.c
- * Copyright (C) 2000-2003 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000-2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.
diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c
index 46ea5c02c..dc380c8de 100644
--- a/src/libspucc/cc_decoder.c
+++ b/src/libspucc/cc_decoder.c
@@ -223,10 +223,14 @@ static const uint8_t *const cc_alpha_palettes[NUM_CC_PALETTES] = {
 /* mapping from PAC row code to actual CC row */
 static const int  rowdata[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6,
 			 7, 8, 9};
-/* FIXME: do real TM */
-/* must be mapped as a music note in the captioning font */ 
-static const char specialchar[] = {'®','°','½','¿','T','¢','£','¶','à',
-			     TRANSP_SPACE,'è','â','ê','î','ô','û'};
+/* FIXME: do real â„¢ (U+2122) */
+/* Code 182 must be mapped as a musical note ('♪', U+266A) in the caption font */ 
+static const char specialchar[] = {
+  174 /* ® */, 176 /* ° */, 189 /* ½ */, 191 /* ¿ */,
+  'T' /* ™ */, 162 /* ¢ */, 163 /* £ */, 182 /* ¶ => ♪ */,
+  224 /* à */, TRANSP_SPACE,232 /* è */, 226 /* â */,
+  234 /* ê */, 238 /* î */, 244 /* ô */, 251 /* û */
+};
 
 /* character translation table - EIA 608 codes are not all the same as ASCII */
 static char chartbl[128];
@@ -427,16 +431,16 @@ static void build_char_table(void)
   for (i = 0; i < 128; i++)
     chartbl[i] = (char) i;
   /* now the special codes */
-  chartbl[0x2a] = 'á';
-  chartbl[0x5c] = 'é';
-  chartbl[0x5e] = 'í';
-  chartbl[0x5f] = 'ó';
-  chartbl[0x60] = 'ú';
-  chartbl[0x7b] = 'ç';
-  chartbl[0x7c] = '÷';
-  chartbl[0x7d] = 'Ñ';
-  chartbl[0x7e] = 'ñ';
-  chartbl[0x7f] = '¤';    /* FIXME: this should be a solid block */
+  chartbl[0x2a] = 225; /* á */
+  chartbl[0x5c] = 233; /* é */
+  chartbl[0x5e] = 237; /* í */
+  chartbl[0x5f] = 243; /* ó */
+  chartbl[0x60] = 250; /* ú */
+  chartbl[0x7b] = 231; /* ç */
+  chartbl[0x7c] = 247; /* ÷ */
+  chartbl[0x7d] = 209; /* Ñ */
+  chartbl[0x7e] = 241; /* ñ */
+  chartbl[0x7f] = 164; /* ¤ FIXME: should be a solid block ('█'; U+2588) */
 }
 
 
diff --git a/src/libw32dll/wine/pe_image.c b/src/libw32dll/wine/pe_image.c
index aa29098c1..c99bbaed0 100644
--- a/src/libw32dll/wine/pe_image.c
+++ b/src/libw32dll/wine/pe_image.c
@@ -1,6 +1,6 @@
 /* 
  *  Copyright	1994	Eric Youndale & Erik Bos
- *  Copyright	1995	Martin von Löwis
+ *  Copyright	1995	Martin von Löwis
  *  Copyright   1996-98 Marcus Meissner
  *
  *	based on Eric Youndale's pe-test and:
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index e6fec60ea..b24f2f496 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -151,7 +151,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512],
     guint32 pointWidth;
     guint32 pointHeight;
     int     i;
-    float   largfactor;	/* elargissement de l'intervalle d'évolution des points */
+    float   largfactor;	/* elargissement de l'intervalle d'évolution des points */
     Pixel *tmp;
     
     ZoomFilterData *pzfd;
@@ -215,7 +215,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512],
         }
     }
     
-    /* par défaut pas de changement de zoom */
+    /* par défaut pas de changement de zoom */
     pzfd = NULL;
     
     /* 
@@ -532,7 +532,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512],
         }
         
         /*
-         * arreter de decrémenter au bout d'un certain temps
+         * arreter de decrémenter au bout d'un certain temps
          */
         if ((goomInfo->cycle % 101 == 0) && (goomInfo->update.zoomFilterData.pertedec == 7)) {
             pzfd = &goomInfo->update.zoomFilterData;
diff --git a/src/post/goom/goom_filters.h b/src/post/goom/goom_filters.h
index f015499a8..06c6d092a 100644
--- a/src/post/goom/goom_filters.h
+++ b/src/post/goom/goom_filters.h
@@ -16,7 +16,7 @@ struct _ZOOM_FILTER_DATA
 	unsigned char sqrtperte;
 	int     middleX, middleY;  /* milieu de l'effet */
 	char    reverse;           /* inverse la vitesse */
-	char    mode;              /* type d'effet à appliquer (cf les #define) */
+	char    mode;              /* type d'effet à appliquer (cf les #define) */
 	/** @since June 2001 */
 	int     hPlaneEffect;      /* deviation horitontale */
 	int     vPlaneEffect;      /* deviation verticale */
diff --git a/src/post/goom/mmx.c b/src/post/goom/mmx.c
index e2f25b47d..3c9d0ee4a 100644
--- a/src/post/goom/mmx.c
+++ b/src/post/goom/mmx.c
@@ -109,7 +109,7 @@ void zoom_filter_mmx (int prevX, int prevY,
 		"pmullw %%mm4, %%mm1 \n\t"
 		"pmullw %%mm5, %%mm2 \n\t"
 
-		/* ajout des valeurs obtenues à la valeur finale */
+		/* ajout des valeurs obtenues à la valeur finale */
 		"paddw %%mm1, %%mm0 \n\t"
 		"paddw %%mm2, %%mm0 \n\t"
 
diff --git a/src/post/goom/sound_tester.c b/src/post/goom/sound_tester.c
index ac50a11b2..b6c4af442 100644
--- a/src/post/goom/sound_tester.c
+++ b/src/post/goom/sound_tester.c
@@ -90,7 +90,7 @@ void evaluate_sound(gint16 data[2][512], SoundInfo *info) {
 	if (info->goom_limit>1)
 		info->goom_limit=1;
 
-	/* toute les 2 secondes : vérifier si le taux de goom est correct
+	/* toute les 2 secondes : vérifier si le taux de goom est correct
 	 * et le modifier sinon.. */
 	if (info->cycle % 64 == 0) {
 		if (info->speedvar<0.01f)
diff --git a/src/post/goom/xmmx.c b/src/post/goom/xmmx.c
index 0048a20e8..6b76a86a3 100644
--- a/src/post/goom/xmmx.c
+++ b/src/post/goom/xmmx.c
@@ -234,7 +234,7 @@ void zoom_filter_xmmx (int prevX, int prevY,
 		pmullw_r2r (mm4, mm1);
 		pmullw_r2r (mm5, mm2);
 
-		/* ajout des valeurs obtenues à la valeur finale */
+		/* ajout des valeurs obtenues à la valeur finale */
 		paddw_r2r (mm1, mm0);
 		paddw_r2r (mm2, mm0);
 
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 4461f8314..73d300f31 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -10,9 +10,9 @@ ff_cflags = -I$(top_srcdir)/contrib/ffmpeg/libpostproc
 postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \
 	       $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a
 $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
-	$(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a
+	$(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a
 $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a:
-	$(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a
+	$(MAKE) -C $(top_builddir)/contrib ffmpeg/libavutil/libavutil.a
 endif
 
 # -fomit-frame-pointer is always needed. it might cause debug to not
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.c b/src/video_out/libdha/kernelhelper/dhahelper.c
index 3ccbee107..0e755064a 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.c
+++ b/src/video_out/libdha/kernelhelper/dhahelper.c
@@ -3,7 +3,7 @@
     
     (C) 2002 Alex Beregszaszi <alex@naxine.org>
     (C) 2002-2003 Nick Kurshev <nickols_k@mail.ru>
-    (C) 2002-2004 Måns Rullgård <mru@users.sourceforge.net>
+    (C) 2002-2004 Måns Rullgård <mru@users.sourceforge.net>
 
     Accessing hardware from userspace as USER (no root needed!)
 
@@ -109,7 +109,7 @@
 #define irqreturn(n) return
 #endif
 
-MODULE_AUTHOR("Alex Beregszaszi <alex@naxine.org>, Nick Kurshev <nickols_k@mail.ru>, Måns Rullgård <mru@users.sf.net>");
+MODULE_AUTHOR("Alex Beregszaszi <alex@naxine.org>, Nick Kurshev <nickols_k@mail.ru>, Måns Rullgård <mru@users.sf.net>");
 MODULE_DESCRIPTION("Provides userspace access to hardware");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
diff --git a/src/video_out/libdha/libdha.c b/src/video_out/libdha/libdha.c
index cb99e1c2d..73a4387a2 100644
--- a/src/video_out/libdha/libdha.c
+++ b/src/video_out/libdha/libdha.c
@@ -3,7 +3,7 @@
     Copyrights:
     1996/10/27	- Robin Cutshaw (robin@xfree86.org)
 		  XFree86 3.3.3 implementation
-    1999	- Øyvind Aabling.
+    1999	- Øyvind Aabling.
     		  Modified for GATOS/win/gfxdump.
 		  
     2002	- library implementation by Nick Kurshev
diff --git a/src/video_out/libdha/libdha.h b/src/video_out/libdha/libdha.h
index e37cae515..2bd8fe39b 100644
--- a/src/video_out/libdha/libdha.h
+++ b/src/video_out/libdha/libdha.h
@@ -3,7 +3,7 @@
     Copyrights:
     1996/10/27	- Robin Cutshaw (robin@xfree86.org)
 		  XFree86 3.3.3 implementation
-    1999	- Øyvind Aabling.
+    1999	- Øyvind Aabling.
     		  Modified for GATOS/win/gfxdump.
     2002	- library implementation by Nick Kurshev
     
diff --git a/src/video_out/libdha/pci.c b/src/video_out/libdha/pci.c
index 1cc70b7aa..db8f4ddd5 100644
--- a/src/video_out/libdha/pci.c
+++ b/src/video_out/libdha/pci.c
@@ -1,6 +1,6 @@
 /*
    (C) 2002 - library implementation by Nick Kyrshev
-   XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
+   XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
  */
 /* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */
 /*
diff --git a/src/video_out/libdha/ports.c b/src/video_out/libdha/ports.c
index 73ad671d1..b531082d3 100644
--- a/src/video_out/libdha/ports.c
+++ b/src/video_out/libdha/ports.c
@@ -1,6 +1,6 @@
 /*
    (C) 2002 - library implementation by Nick Kyrshev
-   XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
+   XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
  */
 /* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */
 /*
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 19c30e766..4338246ae 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -56,6 +56,7 @@
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
+#include <time.h>
 
 #define LOG_MODULE "video_out_xv"
 #define LOG_VERBOSE
@@ -262,7 +263,9 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
     height = 1;
 
   if (this->use_pitch_alignment) {
+    lprintf ("use_pitch_alignment old width=%d",width);
     width = (width + 7) & ~0x7;
+    lprintf ("use_pitch_alignment new width=%d",width);
   }
 
   switch (format) {
@@ -286,6 +289,7 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
     gX11Fail = 0;
     x11_InstallXErrorHandler (this);
 
+    lprintf( "XvShmCreateImage format=0x%x, width=%d, height=%d\n", xv_format, width, height );
     image = XvShmCreateImage(this->display, this->xv_port, xv_format, 0,
 			     width, height, shminfo);
 
@@ -298,6 +302,22 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
       goto finishShmTesting;
     }
 
+    {
+    int q;
+
+    lprintf( "XvImage id %d\n", image->id );
+    lprintf( "XvImage width %d\n", image->width );
+    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] );
+            lprintf( "XvImage offsets[%d] %d\n",  q, image->offsets[q] );
+        }
+    }
+
     shminfo->shmid = shmget(IPC_PRIVATE, image->data_size, IPC_CREAT | 0777);
 
     if (image->data_size==0) {
@@ -754,6 +774,16 @@ static int xv_redraw_needed (vo_driver_t *this_gen) {
   return ret;
 }
 
+/* Used in xv_display_frame to determine how long XvShmPutImage takes
+   - if slower than 60fps, print a message
+*/
+static double timeOfDay()
+{
+    struct timeval t;
+    gettimeofday( &t, NULL );
+    return ((double)t.tv_sec) + (((double)t.tv_usec)/1000000.0);
+}
+
 static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   xv_driver_t  *this  = (xv_driver_t *) this_gen;
   xv_frame_t   *frame = (xv_frame_t *) frame_gen;
@@ -797,9 +827,14 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
    * ask for offset and output size
    */
   xv_redraw_needed (this_gen);
+  {
+  double start_time;
+  double end_time;
+  double elapse_time;
+  int factor;
 
   LOCK_DISPLAY(this);
-
+  start_time = timeOfDay();
   if (this->use_shm) {
     XvShmPutImage(this->display, this->xv_port,
                   this->drawable, this->gc, this->cur_frame->image,
@@ -818,9 +853,20 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   }
 
   XSync(this->display, False);
+  end_time = timeOfDay();
 
   UNLOCK_DISPLAY(this);
 
+  elapse_time = end_time - start_time;
+  factor = (int)(elapse_time/(1.0/60.0));
+
+  if( factor > 1 )
+  {
+    lprintf( "%s PutImage %dX interval (%fs)\n",
+        log_line_prefix(), factor, elapse_time );
+  }
+  }
+
   /*
   printf (LOG_MODULE ": xv_display_frame... done\n");
   */
diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/src/video_out/vidix/drivers/cyberblade_vid.c
index 4b2f243f5..7a32ce7bd 100644
--- a/src/video_out/vidix/drivers/cyberblade_vid.c
+++ b/src/video_out/vidix/drivers/cyberblade_vid.c
@@ -4,7 +4,7 @@
     Copyright (C) 2002 by Alastair M. Robinson.
     Official homepage: http://www.blackfiveservices.co.uk/EPIAVidix.shtml
 
-    Based on Permedia 3 driver by Måns Rullgård
+    Based on Permedia 3 driver by Måns Rullgård
 
     Thanks to Gilles Frattini for bugfixes
 
diff --git a/src/video_out/vidix/drivers/pm2_vid.c b/src/video_out/vidix/drivers/pm2_vid.c
index 1422bbd8b..075b178de 100644
--- a/src/video_out/vidix/drivers/pm2_vid.c
+++ b/src/video_out/vidix/drivers/pm2_vid.c
@@ -1,7 +1,7 @@
 /**
     Driver for 3DLabs Permedia 2.
 
-    Copyright (C) 2002  Måns Rullgård
+    Copyright (C) 2002  Måns Rullgård
 
     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
@@ -62,7 +62,7 @@ int pm2_vidmem = PM2_VIDMEM;
 static vidix_capability_t pm2_cap =
 {
     "3DLabs Permedia2 driver",
-    "Måns Rullgård <mru@users.sf.net>",
+    "Måns Rullgård <mru@users.sf.net>",
     TYPE_OUTPUT,
     { 0, 0, 0, 0 },
     2048,
diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/src/video_out/vidix/drivers/pm3_vid.c
index 8a9e86c7b..72a6523b3 100644
--- a/src/video_out/vidix/drivers/pm3_vid.c
+++ b/src/video_out/vidix/drivers/pm3_vid.c
@@ -1,7 +1,7 @@
 /**
     Driver for 3DLabs GLINT R3 and Permedia3 chips.
 
-    Copyright (C) 2002, 2003  Måns Rullgård
+    Copyright (C) 2002, 2003  Måns Rullgård
 
     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
@@ -63,7 +63,7 @@ static u_int page_size;
 static vidix_capability_t pm3_cap =
 {
     "3DLabs GLINT R3/Permedia3 driver",
-    "Måns Rullgård <mru@users.sf.net>",
+    "Måns Rullgård <mru@users.sf.net>",
     TYPE_OUTPUT,
     { 0, 0, 0, 0 },
     2048,
diff --git a/src/video_out/xvmc_vld.c b/src/video_out/xvmc_vld.c
index ba1b51795..953b65563 100644
--- a/src/video_out/xvmc_vld.c
+++ b/src/video_out/xvmc_vld.c
@@ -22,7 +22,7 @@
  *
  * xvmc_vld.c, X11 decoding accelerated video extension interface for xine
  *
- * Author: Thomas Hellström, (2004)
+ * Author: Thomas Hellström, (2004)
  */
 
 #include "xxmc.h"
diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h
index 5fb9f66ee..d5c067d36 100644
--- a/src/video_out/xxmc.h
+++ b/src/video_out/xxmc.h
@@ -31,7 +31,7 @@
  *
  * overlay support by James Courtier-Dutton <James@superbug.demon.co.uk> - July 2001
  * X11 unscaled overlay support by Miguel Freitas - Nov 2003
- * XxMC implementation by Thomas Hellström - August 2004
+ * XxMC implementation by Thomas Hellström - August 2004
  */
 
 #ifndef _XXMC_H