zum Commit vorgemerkte Änderungen:

geändert:       homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest

homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest

@@ -1,7 +1,7 @@
-FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
-#FFMPEG = ffmpeg
-GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
-#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
+#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
+FFMPEG = ~/proggis/ffmpeg/ffmpeg-4.1.1-amd64-static/ffmpeg
+#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
+GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
 
 DEFAULT_FFMPEG = ffmpeg
 #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
@@ -128,15 +128,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-passlogfile "$(basename $<).firstPassLog" \
-<<<<<<< HEAD
-		-deadline best \
-		-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 \
@@ -157,10 +151,4 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
 	$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 
 videos/thumbnails/%.jpg: videos/thumbnails/%.png
-<<<<<<< HEAD
 	$(GUETZLI) --quality 90 "$<" "$@"
-=======
-#	$(GUETZLI) --quality 90 "$<" "$@"
-	convert "$<" "$@"
-
->>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852