# HG changeset patch # User veltr # Date 1358439711 -3600 # Node ID b1b624f81f226a90297f71d04901d1ad03b5c0cf # Parent f1b68efb360a7c8b58e70c03c6ae9fb2f0feb828# Parent d63d616116a0678a22bdd343f9c2a94105865354 Merge with d63d616116a0678a22bdd343f9c2a94105865354 diff -r d63d616116a0 -r b1b624f81f22 integration/edition.html --- a/integration/edition.html Wed Dec 19 13:33:14 2012 +0100 +++ b/integration/edition.html Thu Jan 17 17:21:51 2013 +0100 @@ -345,7 +345,6 @@ - diff -r d63d616116a0 -r b1b624f81f22 integration/hashcut.html --- a/integration/hashcut.html Wed Dec 19 13:33:14 2012 +0100 +++ b/integration/hashcut.html Thu Jan 17 17:21:51 2013 +0100 @@ -254,7 +254,6 @@ - diff -r d63d616116a0 -r b1b624f81f22 integration/js/mashupcore.js --- a/integration/js/mashupcore.js Wed Dec 19 13:33:14 2012 +0100 +++ b/integration/js/mashupcore.js Thu Jan 17 17:21:51 2013 +0100 @@ -297,6 +297,8 @@ } + var can_play_mp4 = !!document.createElement('video').canPlayType('video/mp4'); + function addMedia(media) { if (media.has_player) { return; @@ -310,116 +312,155 @@ videoEl = $('