Merge branch 'master' of qo.physics.wm.edu:makefile_templates

1 files changed, 10 insertions, 8 deletions

diff --git a/video.mk b/video.mk
index 67fe5f2..0c01b33 100644
--- a/video.mk
+++ b/video.mk
@@ -11,19 +11,21 @@ ffmpegOptions ?= -movflags faststart -r 15 -c:v libx264 -preset veryfast -tune s
 # recode video with no filters
 # ffmpegOptions ?= -movflags faststart -c:v libx264 -preset veryfast -tune stillimage -c:a libfdk_aac -vbr 1
 
-rawDir = rawVideo
-recodedDir = recodedVideo
-readyDir = readyVideo
+rawDir ?= rawVideo
+recodedDir ?= recodedVideo
+readyDir ?= readyVideo
+video_ext_in ?= mp4
+video_ext_out ?= mp4
 
 dest_dir_video_recoded ?= $(dest_dir)/$(recodedDir)
 dest_dir_video_ready ?= $(dest_dir)/$(readyDir)
 destination_dirs += $(dest_dir_video_recoded) $(dest_dir_video_ready)
 
-rawVideo = $(wildcard $(rawDir)/*.mp4)
-recoded_video_from_raw = $(rawVideo:$(rawDir)/%=$(recodedDir)/%)
-recoded_video_dest_targets = $(rawVideo:$(rawDir)/%=$(dest_dir_video_recoded)/%)
+rawVideo = $(wildcard $(rawDir)/*.$(video_ext_in))
+recoded_video_from_raw = $(rawVideo:$(rawDir)/%.$(video_ext_in)=$(recodedDir)/%.$(video_ext_out))
+recoded_video_dest_targets = $(rawVideo:$(rawDir)/%.$(video_ext_in)=$(dest_dir_video_recoded)/%.$(video_ext_out))
 
-readyVideo = $(wildcard $(readyDir)/*.mp4)
+readyVideo = $(wildcard $(readyDir)/*.$(video_ext_out))
 ready_video_dest_targets = $(readyVideo:$(readyDir)/%=$(dest_dir_video_ready)/%)
 
 
@@ -38,7 +40,7 @@ $(dest_dir_video_recoded):
 $(recodedDir):
 	$(INSTALL) -d -m 0755 '$@'
 
-$(recodedDir)/% : $(rawDir)/% | $(recodedDir)
+$(recodedDir)/%.$(video_ext_out) : $(rawDir)/%.$(video_ext_in) | $(recodedDir)
 	ffmpeg -i $< $(ffmpegOptions) $@
 
 install_recoded_video: $(recoded_video_dest_targets)