- Upload teilweise entfernt (ist aber sowieso das falsche Makefile)
modified: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab - Variable für getVideoDuration modified: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest - veralteten Link korrigiert modified: homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md modified: homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
This commit is contained in:
@@ -257,16 +257,16 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
|
||||
-an \
|
||||
-f webm \
|
||||
"$@"
|
||||
curl \
|
||||
--upload-file "$@" \
|
||||
--user cwsvjudo:Dee4oquu \
|
||||
"ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
|
||||
--ftp-create-dirs
|
||||
curl \
|
||||
--upload-file "$@" \
|
||||
--user cwsvjudo:***REMOVED*** \
|
||||
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
|
||||
--ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file "$@" \
|
||||
# --user cwsvjudo:Dee4oquu \
|
||||
# "ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
|
||||
# --ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file "$@" \
|
||||
# --user cwsvjudo:***REMOVED*** \
|
||||
# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
|
||||
# --ftp-create-dirs
|
||||
|
||||
videos/thumbnails/%.jpg: videos/webm/%.webm
|
||||
mkdir -p videos/thumbnails
|
||||
|
||||
@@ -6,6 +6,9 @@ GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
|
||||
DEFAULT_FFMPEG = ffmpeg
|
||||
#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
|
||||
|
||||
GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
|
||||
|
||||
|
||||
# Für eine schnelle Komprimierung libvpx, sonst vp9
|
||||
DEFAULT_VID_CODEC_HEIGHT = 360
|
||||
DEFAULT_VID_CODEC_WIDTH = -2
|
||||
@@ -121,7 +124,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
|
||||
# Die erste Abhängigkeit muss das quellVideo sein!
|
||||
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
|
||||
mkdir -p videos/webm
|
||||
~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<
|
||||
$(GET_VIDEO_DURATION_JSON) $<
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# Second Pass
|
||||
$(FFMPEG) -i $< \
|
||||
@@ -130,7 +133,7 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
|
||||
-pass 2 \
|
||||
-passlogfile "$(basename $<).firstPassLog" \
|
||||
$(VID_CODEC_DEADLINE) \
|
||||
-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
|
||||
-b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \
|
||||
-aspect $(ffmpegDisplayAspectRatio)\
|
||||
-threads 1 \
|
||||
-speed 0 \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
lang: de
|
||||
title: "Helferlein für das Juodtraining"
|
||||
title: "Helferlein für das Judotraining"
|
||||
description: "Kleine Helferlein für das Training, insbesondere das Judotraining"
|
||||
author: "marko"
|
||||
keywords:
|
||||
|
||||
@@ -6,5 +6,5 @@ subNav:
|
||||
- *galerien
|
||||
- *kontakt
|
||||
- *judoWiki
|
||||
- *extras
|
||||
- *tools
|
||||
...
|
||||
|
||||
Reference in New Issue
Block a user