(no commit message)

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index 162873d78d836ecec0559a714148121564155947..beaa3fc973fc9944533d7b19f4a76f7f52a2af41 100644 (file)
--- a/fluidbook/tools/webvideo
+++ b/fluidbook/tools/webvideo
@@ -14,13 +14,24 @@ if [ ! -f $jpg ]
 then
        echo
        echo
-       echo 'making jpg'
+       echo 'making jpg1'
        echo
        echo
 
        /usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:04 -t 00:00:01 -f image2 $jpg
 fi
 
+if [ ! -f $jpg ]
+then
+       echo
+       echo
+       echo 'making jpg2'
+       echo
+       echo
+
+       /usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:00 -t 00:00:01 -f image2 $jpg
+fi
+
 if [ ! -f $mp4 ] && [ extension != "mp4" ]
 then
        echo 'making mp4'

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 0b3d3ad1c892ca6e14fe04ec8934455fc297662f..30657f2af0e0b504016fdc8a07c40471d2d589fb 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -778,8 +778,6 @@ class inpesPopinLink extends htmlMultimediaLink {
                $this->alternative = $this->to;
                $c = parent::getHTMLContent();
 
-
-
                $class = $this->getClasses();
                if ($this->display_area) {
                        $class[] = 'displayArea';