From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 28 Oct 2014 16:08:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7f66076b90aaee6f84961d43f1e33a16004fa29a;p=cubeextranet.git

---

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index 162873d78..beaa3fc97 100644
--- 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 0b3d3ad1c..30657f2af 100644
--- 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';