diff options
| author | ac79b0c6 <[email protected]> | 2023-01-01 11:05:31 +0800 |
|---|---|---|
| committer | ac79b0c6 <[email protected]> | 2023-01-01 11:05:31 +0800 |
| commit | eb46d4278b893b05d09d18e1d79a6ed2b414202a (patch) | |
| tree | d04687d0ba2dcc5d5003e4d5abf0c3820898742f | |
| parent | 9f5c1ac0b282315ac2c2512e62357204487be3f7 (diff) | |
update mkvtool:fix bug.
| -rw-r--r-- | mkvlib/mkv.go | 19 | ||||
| -rw-r--r-- | mkvlib/shared.go | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/mkvlib/mkv.go b/mkvlib/mkv.go index 0bbedde..28a38f2 100644 --- a/mkvlib/mkv.go +++ b/mkvlib/mkv.go @@ -343,17 +343,22 @@ func (self *mkvProcessor) MakeMKVs(dir, data, output, slang, stitle string, subs } p = path.Join(data, d, f) _p := path.Join(p, "subsetted") - subs, _ := findPath(p, `\.(sub)|(pgs)`) asses, _ := findPath(_p, `\.ass$`) - if len(asses) == 0 && subset { + attachments := findFonts(_p) + if len(asses) == 0 { asses, _ = findPath(p, `\.ass$`) - if !self.ASSFontSubset(asses, "", "", false, lcb) { - ok = false - continue + if subset { + if !self.ASSFontSubset(asses, "", "", false, lcb) { + ok = false + continue + } + asses, _ = findPath(_p, `\.ass$`) + attachments = findFonts(_p) + } else { + attachments = findFonts(path.Join(p, "fonts")) } - asses, _ = findPath(_p, `\.ass$`) } - attachments := findFonts(_p) + subs, _ := findPath(p, `\.(sub)|(pgs)`) tracks := append(subs, asses...) if !self.CreateMKV(item, tracks, attachments, fn, slang, stitle, true) { ok = false diff --git a/mkvlib/shared.go b/mkvlib/shared.go index 9ad02cb..5318450 100644 --- a/mkvlib/shared.go +++ b/mkvlib/shared.go @@ -12,7 +12,7 @@ import ( ) const libName = "mkvlib" -const libVer = "v2.2.4" +const libVer = "v2.2.5" const LibFName = libName + " " + libVer |