--- a/integration/js/mashupcore.js	Wed Dec 05 15:39:12 2012 +0100
+++ b/integration/js/mashupcore.js	Thu Dec 06 12:38:34 2012 +0100
@@ -310,18 +310,26 @@
             videoEl = $('<video>'),
             width = $(".video").width(),
             height = $(".video").height(),
+/*
             mp4_file = videourl.replace(/\.webm$/i,'.mp4'),
             webm_file = videourl.replace(/\.mp4$/i,'.webm'),
+*/
             mp4_src = $('<source>'),
-            webm_src = $('<source>');
+/*
+            webm_src = $('<source>'),
+*/
+            lastseektime,
+            currentseektime;
         mp4_src.attr({
-            src: mp4_file,
+            src: videourl, //mp4_file,
             type: "video/mp4"
         });
+/*
         webm_src.attr({
             src: webm_file,
             type: "video/webm"
         });
+*/
         videoEl.attr({
             id : videoid,
             width : width,
@@ -333,7 +341,7 @@
             width : width,
             height : height
         });
-        videoEl.append(mp4_src).append(webm_src);
+        videoEl.append(mp4_src); //.append(webm_src);
         $(".video").append(videoEl);
         
         media.show = function() {
@@ -349,9 +357,14 @@
         
         media.on("setcurrenttime", function(_milliseconds) {
             if (media.loaded) {
-                popcorn.currentTime(_milliseconds / 1000);
-                media.seeking = true;
-                setTimeout(showSeek,200);
+                if (!media.seeking) {
+                    lastseektime = currentseektime = _milliseconds.valueOf();
+                    popcorn.currentTime(currentseektime / 1000);
+                    media.seeking = true;
+                    setTimeout(showSeek,200);
+                } else {
+                    lastseektime = _milliseconds.valueOf();
+                }
             }
         });
         
@@ -413,7 +426,13 @@
         });
         
         popcorn.on("seeked", function() {
-            media.trigger("seeked");
+            if (currentseektime !== lastseektime) {
+                currentseektime = lastseektime;
+                popcorn.currentTime(currentseektime / 1000);
+                media.seeking = true;
+            } else {
+                media.trigger("seeked");
+            }
         });
         
         // Binding UI Events and Mashup Playing to Media