From 1b83f04cd5d9d51f1b60a247376993d86c2b21e1 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 9 Mar 2004 16:05:13 +0000 Subject: [PATCH] More non-ASCII character fixes for --tags and --chapters. --- ChangeLog | 3 +++ src/mkvmerge.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23d0b639b..2e6444f3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-03-09 Moritz Bunkus + * mkvmerge: bug fix: More of the non-ASCII character fixes (in + --tags and --chapters this time). + * mkvmerge/mmg: new feature: Made the process priority selectable and default to 'normal' again (was 'lower' before). diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp index 7ecf27cae..91cf927d2 100644 --- a/src/mkvmerge.cpp +++ b/src/mkvmerge.cpp @@ -1016,7 +1016,7 @@ parse_tags(char *s, mxerror("Invalid tags file name specified in '%s %s'.\n", opt, orig.c_str()); - tags.file_name = safestrdup(s); + tags.file_name = from_utf8(cc_local_utf8, s); } /** \brief Parse the \c --fourcc argument @@ -1847,8 +1847,8 @@ parse_args(int argc, chapter_file_name = from_utf8(cc_local_utf8, next_arg); if (kax_chapters != NULL) delete kax_chapters; - kax_chapters = parse_chapters(next_arg, 0, -1, 0, chapter_language, - chapter_charset); + kax_chapters = parse_chapters(chapter_file_name, 0, -1, 0, + chapter_language, chapter_charset); i++; } else if (!strcmp(this_arg, "--no-chapters")) {