3 files changed, 4 insertions, 2 deletions
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index ee45963a5..0b4f5c513 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -94,7 +94,7 @@ static int extended_to_int(const unsigned char p[10])
         m = (m<<8) + p[2+i];;
     e = (((int)p[0]&0x7f)<<8) | p[1];
     if (e == 0x7fff && m)
-        return 0.0/0.0;
+        return (int)(0.0/0.0);
     e -= 16383 + 63;
 
     if (p[0]&0x80)
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 14a8ac29a..e0abd0cd6 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -446,6 +446,7 @@ static const struct ogg_meta {
   OGG_META   (COMMENT,     0),
 };
 
+#if 0
 /* ensure that those marked "append" are cleared */
 /* FIXME: is this useful? Should they be cleared on first write? */
 static void prepare_read_comments (demux_ogg_t *this)
@@ -458,6 +459,7 @@ static void prepare_read_comments (demux_ogg_t *this)
       this->meta[metadata[i].meta] = NULL;
     }
 }
+#endif
 
 static int read_comments (demux_ogg_t *this, const char *comment)
 {
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 57d2c8357..cf3745211 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -100,7 +100,7 @@ static int open_tta_file(demux_tta_t *this) {
   }
 
   this->seektable = calloc(this->totalframes, sizeof(uint32_t));
-  this->input->read(this->input, this->seektable, sizeof(uint32_t)*this->totalframes);
+  this->input->read(this->input, (uint8_t*)this->seektable, sizeof(uint32_t)*this->totalframes);
 
   /* Skip the CRC32 */
   this->input->seek(this->input, 4, SEEK_CUR);