Merge branch 'redesign2017' of /i/gitRepositories/judo into redesign2018

This commit is contained in:
marko
2019-07-09 07:13:28 +02:00
3 changed files with 14 additions and 3 deletions

View File

@@ -12,4 +12,8 @@ firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
#makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
makefileDir = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg

View File

@@ -72,3 +72,7 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
videos/thumbnails/%.jpg: videos/thumbnails/%.png
$(GUETZLI) --quality 90 "$<" "$@"
# convert "$<" "$@"
.PHONY: echo
echo:
echo $(GET_VIDEO_DURATION_JSON)

View File

@@ -1,6 +1,9 @@
#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
#FFMPEG = ffmpeg
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg
GUETZLI = ~/tmp/guetzli/bin/Release/guetzli
#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
DEFAULT_FFMPEG = ffmpeg