summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-05-13 01:49:54 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-05-13 01:49:54 +0000
commita0b0b415515bff5f9edd43d373e8e78f3b3f8e4d (patch)
treea101f7a71a33f75c21d4ac828f442d902f5d8af9 /modules/gallery/views
parent104430e9e1e8dacd5e4320e29e59fc59aa5c6ee9 (diff)
parent9affa8ebbd539396d71f19003b91af577a8a183e (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
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',