Updated to version 1.4.1

Changes:

- added help file

1.4.1:
======
- bugfixes

1.4.0:
======
- support for MPEG-1 and MPEG-2 video read from PS and ES streams,
- support for AVC (aka h.264) video from MP4 files,
- support for concatenating files,
- support for the new elements needed for menus,
- support for WAVPACK4 lossless and lossy audio,
- support for extracting VobSubs and
- added an online help to mmg accessible by pressing F1

4 files changed, 11 insertions, 55 deletions

diff --git a/multimedia/mmg/patches/patch-ab b/multimedia/mmg/patches/patch-ab
index b22b0b8d348..71951945d69 100644
--- a/multimedia/mmg/patches/patch-ab
+++ b/multimedia/mmg/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/08 18:22:14 salo Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/23 16:58:39 salo Exp $
 
---- doc/mmg.1.orig	2004-05-06 19:47:45.000000000 +0200
-+++ doc/mmg.1	2004-05-08 18:44:49.000000000 +0200
-@@ -23,7 +23,8 @@
- be loaded directly after startup. This way \fBmmg\fR preferences files
- can be associated with \fBmmg\fR itself.
- .LP
--The full documentation is available in HTML form (doc/mkvmerge-gui.html).
-+The full documentation is available in HTML form
-+(@PREFIX@/share/doc/html/mmg/guide.html).
+--- src/mmg/mmg.cpp.orig	2005-03-02 22:34:35.000000000 +0100
++++ src/mmg/mmg.cpp	2005-03-23 17:27:01.000000000 +0100
+@@ -1153,7 +1153,7 @@
+     wxConfigBase *cfg;
+     bool first;
  
- 
- .SH AUTHOR
+-    help_path = wxGetCwd();
++    help_path = "@HELPDIR@";
+     cfg = wxConfigBase::Get();
+     cfg->SetPath(wxT("/GUI"));
+     if (!cfg->Read(wxT("help_path"), &help_path))
diff --git a/multimedia/mmg/patches/patch-ac b/multimedia/mmg/patches/patch-ac
deleted file mode 100644
index 2d2fb05ff43..00000000000
--- a/multimedia/mmg/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/05 23:45:36 salo Exp $
-
---- src/common/aac_common.h.orig	Sat Jan 29 23:33:01 2005
-+++ src/common/aac_common.h	Sat Jan 29 23:33:23 2005
-@@ -57,7 +57,7 @@
- int MTX_DLL_API create_aac_data(unsigned char *data, int profile,
-                                 int channels, int sample_rate,
-                                 int output_sample_rate, bool sbr);
--bool MTX_DLL_API parse_aac_codec_id(const string &codec_id, int &id,
-+bool MTX_DLL_API parse_aac_codec_id(const char *codec_id, int &id,
-                                     int &profile);
- 
- #endif // __AACCOMMON_H
diff --git a/multimedia/mmg/patches/patch-ad b/multimedia/mmg/patches/patch-ad
deleted file mode 100644
index b48d30e032e..00000000000
--- a/multimedia/mmg/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/02/05 23:45:36 salo Exp $
-
---- src/common/aac_common.cpp.orig	Sat Jan 29 23:27:27 2005
-+++ src/common/aac_common.cpp	Sat Jan 29 23:32:45 2005
-@@ -232,10 +232,10 @@
- }
- 
- bool
--parse_aac_codec_id(const string &codec_id,
-+parse_aac_codec_id(const char *codec_id,
-                    int &id,
-                    int &profile) {
--  if (codec_id.size() < strlen(MKV_A_AAC_2LC))
-+  if (strlen(codec_id) < strlen(MKV_A_AAC_2LC))
-     return false;
- 
-   if (codec_id[10] == '2')
diff --git a/multimedia/mmg/patches/patch-ae b/multimedia/mmg/patches/patch-ae
deleted file mode 100644
index cfba51fd86d..00000000000
--- a/multimedia/mmg/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/02/05 23:45:36 salo Exp $
-
---- src/input/r_matroska.cpp.orig	Sat Jan 29 23:33:37 2005
-+++ src/input/r_matroska.cpp	Sat Jan 29 23:34:16 2005
-@@ -1668,7 +1668,7 @@
-           id = 0;
-           profile = 0;
-           if (t->a_formattag == FOURCC('M', 'P', '4', 'A')) {
--            if (!parse_aac_codec_id(string(t->codec_id), id, profile))
-+            if (!parse_aac_codec_id(t->codec_id, id, profile))
-               mxerror(FMT_TID "Malformed codec id '%s'.\n", ti->fname,
-                       (int64_t)t->tnum, t->codec_id);
-           } else {