3 files changed, 4 insertions, 4 deletions
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 3b2489a43..5ad959d51 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1756,7 +1756,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("mpeg pes demux plugin");
   this->demux_class.identifier      = "MPEG_PES";
-  this->demux_class.mimetypes       = NULL;
+  this->demux_class.mimetypes       = "video/mp2p: m2p: MPEG2 program stream;";
   this->demux_class.extensions      = "pes vdr:/ netvdr:/";
   this->demux_class.dispose         = default_demux_class_dispose;
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 8c8250cf4..39b273abf 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2441,7 +2441,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("MPEG Transport Stream demuxer");
   this->demux_class.identifier      = "MPEG_TS";
-  this->demux_class.mimetypes       = NULL;
+  this->demux_class.mimetypes       = "video/mp2t: m2t: MPEG2 transport stream;";
 
   /* accept dvb streams; also handle the special dvbs,dvbt and dvbc
    * mrl formats: the content is exactly the same but the input plugin
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index d7c2a65cd..3df30daef 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -128,7 +128,7 @@ static int demux_tta_send_chunk(demux_plugin_t *this_gen) {
     /* Get a buffer */
     buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo);
     buf->type = BUF_AUDIO_TTA;
-    buf->pts = (int64_t)(FRAME_TIME * this->currentframe) * 90000;
+    buf->pts = (int64_t)(FRAME_TIME * this->currentframe * 90000);
     buf->extra_info->total_time = (int)(le2me_32(this->header.tta.data_length) * 1000.0 / le2me_32(this->header.tta.samplerate)); /* milliseconds */ 
     buf->decoder_flags = 0;
 
@@ -137,7 +137,7 @@ static int demux_tta_send_chunk(demux_plugin_t *this_gen) {
       (int) ((double) this->currentframe * 65535 / this->totalframes);
 
     /* Set time */
-    buf->extra_info->input_time = (int)(FRAME_TIME * this->currentframe)*1000;
+    buf->extra_info->input_time = (int)(FRAME_TIME * this->currentframe * 1000);
 
     bytes_read = this->input->read(this->input, buf->content, ( bytes_to_read > buf->max_size ) ? buf->max_size : bytes_to_read);
     if (bytes_read < 0) {