From d95da364e412becdfd52d3fb8967e214096e0c70 Mon Sep 17 00:00:00 2001
From: marko <marko@helko>
Date: Wed, 13 Mar 2019 07:14:49 +0100
Subject: [PATCH] Fehler aus letztem Marge korregiert

	modified:   homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
---
 .../src/Makefiles/Makefile.vidstabTest        | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
index 9cee755..d827f68 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
@@ -88,6 +88,7 @@ targets:
 
 # Die Stabilisierungsberechnung:
 # eventuell sollte hier die Skalierung vorgeschaltet werden...
+# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer?
 videos/.forCompressing/%.trf: videos/.forCompressing/%.video
 	$(FFMPEG) -i $^ \
 		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \
@@ -128,15 +129,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-passlogfile "$(basename $<).firstPassLog" \
-<<<<<<< HEAD
-		-deadline best \
+		$(VID_CODEC_DEADLINE) \
 		-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
 		-aspect $(ffmpegDisplayAspectRatio)\
-=======
-		$(VID_CODEC_DEADLINE) \
-		-b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
-		-aspect 16:9 \
->>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
 		-threads 1 \
 		-speed 0 \
 		-tile-columns 0 \
@@ -149,18 +144,14 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 		-f webm \
 	$@
 
-videos/thumbnails/%.png: videos/.forCompressing/%.video
+#videos/thumbnails/%.png: videos/.forCompressing/%.video
+videos/thumbnails/%.png: videos/webm/%.webm
 	mkdir -p videos/thumbnails
 #	$(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@"
 #	$(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 #	$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@"
-	$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
+	$(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 
 videos/thumbnails/%.jpg: videos/thumbnails/%.png
-<<<<<<< HEAD
 	$(GUETZLI) --quality 90 "$<" "$@"
-=======
-#	$(GUETZLI) --quality 90 "$<" "$@"
-	convert "$<" "$@"
-
->>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
+#	convert "$<" "$@"