Merged 1963.

This commit is contained in:
Moritz Bunkus 2004-08-04 21:04:26 +00:00
parent b772be8dec
commit 9961f8a682
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2004-08-04 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: use the same UID for the EditionUID in the
chapters and in the tag targets when parsing a CUE sheet.
2004-08-02 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge/mkvextract: new feature: Use the new EditionUID entries

View File

@ -307,7 +307,6 @@ add_elements_for_cue_entry(cue_parser_args_t &a,
if (a.edition == NULL) {
a.edition = &GetChild<KaxEditionEntry>(*a.chapters);
a.edition_uid = create_unique_uint32();
*static_cast<EbmlUInteger *>(&GetChild<KaxEditionUID>(*a.edition)) =
a.edition_uid;
}
@ -409,6 +408,7 @@ parse_cue_chapters(mm_text_io_c *in,
a.line_num = 0;
a.start_00 = -1;
a.start_01 = -1;
a.edition_uid = create_unique_uint32();
try {
while (in->getline2(line)) {
a.line_num++;