From 8cca15fa076df60368cf2a0a9a5b2e2f97fdda4d Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 5 May 2005 14:38:08 +0000 Subject: [PATCH] Strip newlines at the end of the "Format=" line. Otherwise the fields wanted might not be found and would be missing in the output. --- ChangeLog | 6 ++++++ src/extract/xtr_textsubs.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fcbb73e6c..582b7ec0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-05 Moritz Bunkus + + * mkvextract: bug fix: SSA/ASS text was missing in the output if + the "Format=" line contained newlines at the end of the + CodecPrivate data (e.g. our old Mew Mew sample file). + 2005-05-03 Moritz Bunkus * mkvmerge: new feature: Added support for the ChapterSegmentUID diff --git a/src/extract/xtr_textsubs.cpp b/src/extract/xtr_textsubs.cpp index d140c06c8..57e0f2037 100644 --- a/src/extract/xtr_textsubs.cpp +++ b/src/extract/xtr_textsubs.cpp @@ -164,7 +164,7 @@ xtr_ssa_c::create_file(xtr_base_c *_master, if (pos2 < 0) pos2 = sconv.length(); ssa_format = split(sconv.substr(pos1 + 7, pos2 - pos1 - 7), ","); - strip(ssa_format); + strip(ssa_format, true); for (pos1 = 0; pos1 < ssa_format.size(); pos1++) ssa_format[pos1] = downcase(ssa_format[pos1]);