diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-01-22 09:30:59 -0500 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-01-22 09:30:59 -0500 |
| commit | 5e8257aca57b5952e0cff830a2da2ec23182c965 (patch) | |
| tree | e3c5a29f0d867dd576229203a3494cb0f0dfec57 | |
| parent | a17e2dfe7a2ed9b033ce8ee224395fdaea21bdfe (diff) | |
| download | html5ks-5e8257aca57b5952e0cff830a2da2ec23182c965.tar.xz html5ks-5e8257aca57b5952e0cff830a2da2ec23182c965.zip | |
Stuff.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | www/js/api.js | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -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" |