summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--www/js/api.js1
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9d9ac11..3c8c77c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,16 @@ CVIDEO := $(MP4) $(WEBM) $(OGV)
video: $(CVIDEO)
+%.y4m: %.mkv
+ $(FFMPEG) -i $< -c:a copy $@
+
%.mp4: %.mkv
$(FFMPEG) -i $< -c:v libx264 -preset slower -tune animation -c:a libfdk_aac $@
%.webm: %.mkv
+ $(FFMPEG) -i $< -strict -2 -c:v libvpx -crf 10 -b:v 1M -c:a copy $@
+
+%.vp9.webm: %.mkv
$(FFMPEG) -i $< -strict -2 -c:v libvpx-vp9 -crf 8 -b:v 1M -c:a copy $@
%.ogv: %.mkv
diff --git a/www/js/api.js b/www/js/api.js
index d659cbb..ed357de 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -125,6 +125,7 @@ window.html5ks.api = new (function () {
}
var types = {
+ "vp9": "vp9.webm",
"webm": "webm",
"ogg": "ogv",
"h264": "mp4"