From c31f00ed630877e4c0792fc93e19b969a45d52fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Tue, 8 Jun 2010 19:28:22 +0000
Subject: [PATCH] Fix the MATROSKA_ID_TAGDEFAULT to match the specification
(instead of libmatroska etc. typo) but continue to support the "old" value.
Originally committed as revision 23539 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/matroska.h | 3 ++-
libavformat/matroskadec.c | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 40ab3a74247..0d0d0bcff48 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -148,7 +148,8 @@
#define MATROSKA_ID_TAGNAME 0x45A3
#define MATROSKA_ID_TAGSTRING 0x4487
#define MATROSKA_ID_TAGLANG 0x447A
-#define MATROSKA_ID_TAGDEFAULT 0x44B4
+#define MATROSKA_ID_TAGDEFAULT 0x4484
+#define MATROSKA_ID_TAGDEFAULT_BUG 0x44B4
#define MATROSKA_ID_TAGTARGETS 0x63C0
#define MATROSKA_ID_TAGTARGETS_TYPE 0x63CA
#define MATROSKA_ID_TAGTARGETS_TYPEVALUE 0x68CA
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 33e3d884ed3..75da12a3ccc 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -426,6 +426,7 @@ static EbmlSyntax matroska_simpletag[] = {
{ MATROSKA_ID_TAGSTRING, EBML_UTF8, 0, offsetof(MatroskaTag,string) },
{ MATROSKA_ID_TAGLANG, EBML_STR, 0, offsetof(MatroskaTag,lang), {.s="und"} },
{ MATROSKA_ID_TAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTag,def) },
+ { MATROSKA_ID_TAGDEFAULT_BUG, EBML_UINT, 0, offsetof(MatroskaTag,def) },
{ MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag,sub), {.n=matroska_simpletag} },
{ 0 }
};
--
GitLab