Commit Graph

18 Commits

Author SHA1 Message Date
nyanmisaka 3b50c0dde1 Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 12:30:16 +08:00
nyanmisaka 9e9ecbd677 expose h265 crf option 2020-11-14 03:33:15 +08:00
nyanmisaka 54db12359c add initial support for fMP4-HLS 2020-11-12 20:03:38 +08:00
Anthony Lavado 9603d2bb5e Merge pull request #1636 from nyanmisaka/fonts
Add options to use multiple custom fonts for subtitle rendering
2020-11-08 10:27:16 -05:00
dkanada 65d09b5177 Merge branch 'master' into muxer-ui 2020-09-12 05:34:56 +09:00
Anthony Lavado 8e3458f230 Merge pull request #1487 from nyanmisaka/tonemap-ui
Tonemapping function dashboard options
2020-09-11 09:16:42 -04:00
Nyanmisaka ab1799544c Merge branch 'master' into fonts 2020-09-04 21:52:46 +08:00
Nyanmisaka f10535fc8c update strings 2020-09-04 21:45:12 +08:00
Orry Verducci 5f96b19772 Merge branch 'master' into deinterlace-improvements 2020-09-03 22:01:22 +01:00
nyanmisaka 9f92c1d158 expose max_muxing_queue_size to user 2020-08-25 01:57:21 +08:00
dkanada d9f286124d more string updates 2020-08-24 08:39:26 +09:00
dkanada 955d7464ff remove translations with duplicate values 2020-08-24 08:20:29 +09:00
nyanmisaka 7dfe5ba185 Merge remote-tracking branch 'upstream/master' into tonemap-ui 2020-08-19 17:50:01 +08:00
nyanmisaka f1804009e6 Merge remote-tracking branch 'upstream/master' into fonts 2020-08-19 17:25:25 +08:00
Orry Verducci 1c96222957 Merge branch 'master' into deinterlace-improvements 2020-08-13 21:43:25 +01:00
Orry Verducci 077c02282f Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:11:25 +01:00
dkanada 23d0f25c74 remove some duplicate strings from the source 2020-08-09 23:10:58 +09:00
MrTimscampi 2d72645aad Move HTML files to the proper locations 2020-08-08 03:34:21 +02:00