summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-05-08 21:09:15 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-05-08 21:09:15 -0700
commit357d20a6800d75c266ebe4281ebdd08e88a6e13a (patch)
tree16c04abd61e0b5721b051142b55fd9ca6f226cd1 /modules/gallery/views
parent14683ec0e8b8b9622539990c8d56310b0e0ced21 (diff)
parentb2f7f80efb4fc8de7c1be966720a5006310fefdb (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/movieplayer.html.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index f7af8d93..2e79b620 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -5,12 +5,13 @@
"<?= $attrs["id"] ?>",
{
src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
- wmode: "transparent"
+ wmode: "transparent",
+ provider: "pseudostreaming"
},
{
plugins: {
- h264streaming: {
- url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
+ pseudostreaming: {
+ url: "<?= url::abs_file("lib/flowplayer.pseudostreaming.swf") ?>"
},
controls: {
autoHide: 'always',