summaryrefslogtreecommitdiff
path: root/mkvlib
diff options
context:
space:
mode:
authorb5f0d6c3 <[email protected]>2022-04-27 17:11:01 +0800
committerb5f0d6c3 <[email protected]>2022-04-27 17:11:01 +0800
commit965623200faf04f3220a24fcb99d0403d94e0be8 (patch)
tree3527bdb26f41b5306488aafa4bafde5bdd0cd004 /mkvlib
parent0750fbbe322504cd25acaf554a6eb26be9903d17 (diff)
update mkvtool:fix fallback bug
Diffstat (limited to 'mkvlib')
-rw-r--r--mkvlib/ass.go10
-rw-r--r--mkvlib/shared.go2
2 files changed, 6 insertions, 6 deletions
diff --git a/mkvlib/ass.go b/mkvlib/ass.go
index 8c2b11d..1527bbf 100644
--- a/mkvlib/ass.go
+++ b/mkvlib/ass.go
@@ -31,7 +31,7 @@ type fontInfo struct {
oldName string
newName string
sFont string
- _type string
+ rand string
}
type fontCache struct {
@@ -380,7 +380,7 @@ func (self *assProcessor) matchFonts() bool {
if _v[0][_k[0]] && (_v[1][_k[1]] || _tk(_v[1])) {
self.m[k].file = __k
self.m[k].index = reg.FindStringSubmatch(___k)[1]
- self.m[k]._type = _k[1]
+ self.m[k].rand = randomStr(4)
n := self.fg[_k[0]]
if n == "" {
n = randomStr(8)
@@ -399,7 +399,7 @@ func (self *assProcessor) matchFonts() bool {
}
if f, i := self.matchCache(fmt.Sprintf("%s^%s", _k[0], _k[1])); f != "" {
self.m[k].file, self.m[k].index = f, i
- self.m[k]._type = _k[1]
+ self.m[k].rand = randomStr(4)
n := self.fg[_k[0]]
if n == "" {
n = randomStr(8)
@@ -423,7 +423,7 @@ func (self *assProcessor) matchFonts() bool {
func (self *assProcessor) createFontSubset(font *fontInfo) bool {
ok := false
- fn := fmt.Sprintf(`%s^%s.txt`, font.file, font._type)
+ fn := fmt.Sprintf(`%s^%s.txt`, font.file, font.rand)
_, fn, _, _ = splitPath(fn)
fn = path.Join(self.tDir, fn)
_, n, e, ne := splitPath(font.file)
@@ -436,7 +436,7 @@ func (self *assProcessor) createFontSubset(font *fontInfo) bool {
return false
}
if os.WriteFile(fn, []byte(font.str), os.ModePerm) == nil {
- _fn := fmt.Sprintf("%s^%s.%s%s", ne, font._type, font.newName, e)
+ _fn := fmt.Sprintf("%s^%s.%s%s", ne, font.rand, font.newName, e)
_fn = path.Join(self.output, _fn)
args := make([]string, 0)
args = append(args, "--text-file="+fn)
diff --git a/mkvlib/shared.go b/mkvlib/shared.go
index e954d72..f71f9a8 100644
--- a/mkvlib/shared.go
+++ b/mkvlib/shared.go
@@ -11,7 +11,7 @@ import (
)
const libName = "mkvlib"
-const libVer = "v1.5.1"
+const libVer = "v1.5.2"
const LibFName = libName + " " + libVer