From 04b9c742e440eef1500b7d7621761bfc5b03a297 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 18 Nov 2005 19:46:47 +0000 Subject: [PATCH] Erase the stored_name after each attached file so that the mkvmerge will not complain about multiple --attachment-name arguments for a single attachment. --- ChangeLog | 5 +++++ src/merge/output_control.h | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index c64160882..234adae50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-11-18 Moritz Bunkus + * mkvmerge: bug fix: If at least or more attachments were present + and the user used --attachment-name for each of them (as mmg does) + then mkvmerge was wrongly outputting a warning about multiple uses + of --attachment-name for a single attachment. + * mkvmerge: new feature: Added limited support for edit lists in MP4/QuickTime files. Fixes Anthill bug #151. diff --git a/src/merge/output_control.h b/src/merge/output_control.h index d1d3c8c7e..13e388f03 100644 --- a/src/merge/output_control.h +++ b/src/merge/output_control.h @@ -105,6 +105,7 @@ struct attachment_t { } void clear() { name = ""; + stored_name = ""; mime_type = ""; description = ""; id = 0;