lavf/matroska: ignore ChapCountry ID for now

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavf/matroska: ignore ChapCountry ID for now
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
cf2719ab · Rodger Combs · Michael Niedermayer · 2a0fc559 · cf2719ab · cf2719ab
Commit cf2719ab authored Sep 20, 2015 by Rodger Combs Committed by Michael Niedermayer Sep 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

matroska.h libavformat/matroska.h +1 -0

matroskadec.c libavformat/matroskadec.c +3 -2

No files found.
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -218,6 +218,7 @@
 #define MATROSKA_ID_CHAPTERDISPLAY      0x80
 #define MATROSKA_ID_CHAPSTRING          0x85
 #define MATROSKA_ID_CHAPLANG            0x437C
+#define MATROSKA_ID_CHAPCOUNTRY         0x437E
 #define MATROSKA_ID_EDITIONUID          0x45BC
 #define MATROSKA_ID_EDITIONFLAGHIDDEN   0x45BD
 #define MATROSKA_ID_EDITIONFLAGDEFAULT  0x45DB

--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -474,8 +474,9 @@ static const EbmlSyntax matroska_attachments[] = {
 };

 static const EbmlSyntax matroska_chapter_display[] = {
-    { MATROSKA_ID_CHAPSTRING, EBML_UTF8, 0, offsetof(MatroskaChapter, title) },
-    { MATROSKA_ID_CHAPLANG,   EBML_NONE },
+    { MATROSKA_ID_CHAPSTRING,  EBML_UTF8, 0, offsetof(MatroskaChapter, title) },
+    { MATROSKA_ID_CHAPLANG,    EBML_NONE },
+    { MATROSKA_ID_CHAPCOUNTRY, EBML_NONE },
    { 0 }
 };