diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-06-08 19:28:22 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-06-08 19:28:22 +0000 |
| commit | c31f00ed630877e4c0792fc93e19b969a45d52fb (patch) | |
| tree | f3977cc3a4d75b5aa5ce6866acb0b2ef7f7c18d6 | |
| parent | b659c8b4b772a885e8fea2911199bd5d98854cd9 (diff) | |
| download | ffmpeg-c31f00ed630877e4c0792fc93e19b969a45d52fb.tar.gz | |
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
| -rw-r--r-- | libavformat/matroska.h | 3 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 40ab3a7424..0d0d0bcff4 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 33e3d884ed..75da12a3cc 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 } }; |