5 files changed, 18 insertions, 12 deletions
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index 24a31c1cb..0606586cb 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 the xine project
+ * Copyright (C) 2005-2008 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -199,6 +199,12 @@ static int open_dts_file(demux_dts_t *this) {
       sfreq = peak[this->data_start+8] & 0x0f;
       break;
 
+    default:
+      xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+               LOG_MODULE ": unsupported DTS bitstream encoding %d\n",
+               dts_version);
+      return 0;
+
     }
 
     if ((sfreq > sizeof(dts_sample_rates)/sizeof(int)) ||
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 32dd2cb51..d9ac952d8 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2006 the xine project
+ * Copyright (C) 2000-2008 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -257,7 +257,6 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
   uint8_t       *p;
   int32_t        result;
   off_t          i;
-  int32_t        n;
   uint8_t        buf6[ 6 ];
   
   this->scr = 0;
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 32b516537..aa4dfc26b 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2005 the xine project
+ * Copyright (C) 2000-2008 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -1067,7 +1067,7 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
   
   /* read the packet information */
   const uint16_t stream   = _X_BE_16(&header[4]);
-  const off_t offset   = this->input->get_current_pos(this->input);
+  const off_t offset __attr_unused = this->input->get_current_pos(this->input);
   uint16_t size     = _X_BE_16(&header[2]) - DATA_PACKET_HEADER_SIZE;
   const uint32_t timestamp= _X_BE_32(&header[6]);
   int64_t pts      = (int64_t) timestamp * 90;
@@ -1111,7 +1111,7 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
 	 * seems to be a very short header
 	 * 2 bytes, purpose of the second byte yet unknown
 	 */
-	 const int bummer = stream_read_char (this);
+	 const int bummer __attr_unused = stream_read_char (this);
 	 lprintf ("bummer == %02X\n",bummer);
 
 	 vpkg_offset = 0;
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index a49084ba7..442bffadc 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2008 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -139,8 +139,7 @@
 
 #define CD_RAW_SECTOR_SIZE 2352
 
-static const uint8_t STR_MAGIC =
-  { 0x60, 0x01, 0x01, 0x80 };
+#define STR_MAGIC "\x60\x01\x01\x80"
 #define STR_MAX_CHANNELS 32
 
 #define CDXA_TYPE_MASK     0x0E
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 4a1cc78ec..5fbec7b69 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2005 the xine project
+ * Copyright (C) 2001-2008 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -112,6 +112,7 @@ static int find_chunk_by_tag(demux_wav_t *this, const uint32_t given_chunk_tag,
 static int open_wav_file(demux_wav_t *this) {
   uint8_t signature[WAV_SIGNATURE_SIZE];
   off_t wave_pos;
+  uint32_t wave_size;
 
   /* check the signature */
   if (_x_demux_read_header(this->input, signature, WAV_SIGNATURE_SIZE) != WAV_SIGNATURE_SIZE)
@@ -122,8 +123,9 @@ static int open_wav_file(demux_wav_t *this) {
 
   /* search for the 'fmt ' chunk first */
   wave_pos = 0;
-  if (find_chunk_by_tag(this, fmt_TAG, &this->wave_size, &wave_pos)==0)
+  if (find_chunk_by_tag(this, fmt_TAG, &wave_size, &wave_pos)==0)
     return 0;
+  this->wave_size = wave_size;
 
   this->input->seek(this->input, wave_pos, SEEK_SET);
   this->wave = malloc( this->wave_size );
@@ -146,7 +148,7 @@ static int open_wav_file(demux_wav_t *this) {
 
   /* search for the 'data' chunk */
   this->data_start = this->data_size = 0;
-  if (find_chunk_by_tag(this, data_TAG, &this->data_size, &this->data_start)==0)
+  if (find_chunk_by_tag(this, data_TAG, NULL, &this->data_start)==0)
   {
     free (this->wave);
     return 0;