From 48203dc9350df57b9bff4f6286a0686026875e53 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Wed, 21 Nov 2018 11:18:15 +0100
Subject: [PATCH] =?UTF-8?q?-=20Upload=20zu=20square7=20entfernt=20=09ge?=
 =?UTF-8?q?=C3=A4ndert:=20=20=20=20=20=20=20homepage/redesign2018/markdown?=
 =?UTF-8?q?Experiment/src/Makefiles/Makefile.vp9=20-=20config.inc.php=20ko?=
 =?UTF-8?q?rrigiert=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20homepage/redes?=
 =?UTF-8?q?ign2018/markdownExperiment/src/galleryHelper/vidGal.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Makefiles/Makefile.vp9                   | 16 ++++++++++------
 .../src/galleryHelper/vidGal.php                 |  2 +-
 homepage/redesign2018/markdownExperiment/zopfli  |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9 b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
index 2511401..3fa746f 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
@@ -3,11 +3,11 @@ include Makefile.cfg
 # Standardwerte
 
 # Für eine schnelle Komprimierung
-DEFAULT_VID_CODEC = libvpx 
+#DEFAULT_VID_CODEC = libvpx 
 DEFAULT_VID_CODEC_BITRATE = 500k
 DEFAULT_VID_CODEC_HEIGHT = 320
 #DEFAULT_VID_CODEC_BITRATE = 250k
-#DEFAULT_VID_CODEC = libvpx-vp9
+DEFAULT_VID_CODEC = libvpx-vp9
 
 
 # Standardwerte auf die benutzen Variablen schreiben, falls diese noch 
@@ -62,7 +62,8 @@ TEST:
 videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -73,7 +74,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -97,7 +99,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -108,7 +111,8 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
index f88279e..5342530 100644
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
@@ -1,7 +1,7 @@
 <?php
+$basePath = "/users/cwsvjudo/www";
 include_once("config.inc.php");
 
-	$basePath = "/users/cwsvjudo/www";
 
 	require_once($basePath."/config/cwsvJudo.config.php");
 
diff --git a/homepage/redesign2018/markdownExperiment/zopfli b/homepage/redesign2018/markdownExperiment/zopfli
index f0010d0..ae43a8b 160000
--- a/homepage/redesign2018/markdownExperiment/zopfli
+++ b/homepage/redesign2018/markdownExperiment/zopfli
@@ -1 +1 @@
-Subproject commit f0010d0c13a71ee44f48bb9d2eb3160aee5ed458
+Subproject commit ae43a8b73827577c4b19b005b6eed81f5cf9bbac