summaryrefslogtreecommitdiffstats
path: root/libmpdemux/ebml.h
diff options
context:
space:
mode:
authorDaniel Dawson <ddawson@icehouse.net>2009-12-01 03:59:38 -0800
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-04 07:15:22 +0200
commit9b81b7827ce4ce887c6f22332e31b058f68cf3ac (patch)
treef70779d648044f0d3e7dc50b3906e7eb8452a7ed /libmpdemux/ebml.h
parent55f94a1a91bf9bf28b5b33f698c28a86c08e0e75 (diff)
downloadmpv-9b81b7827ce4ce887c6f22332e31b058f68cf3ac.tar.bz2
mpv-9b81b7827ce4ce887c6f22332e31b058f68cf3ac.tar.xz
demux_mkv: Detect and warn about virtual timeline nesting
Detect use of ChapterSegmentEditionUID element in a Matroska chapter definition, indicating inclusion of an external virtual timeline, which is not yet supported. Leave the chapter is the chapter list but set segment_uid to zero. This way timeline parsing will skip the chapter and avoid nonsensical output but will still print information about missing content.
Diffstat (limited to 'libmpdemux/ebml.h')
-rw-r--r--libmpdemux/ebml.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h
index 4faf2495f1..a224bcd8e0 100644
--- a/libmpdemux/ebml.h
+++ b/libmpdemux/ebml.h
@@ -152,6 +152,8 @@
#define MATROSKA_ID_CHAPTERDISPLAY 0x80
#define MATROSKA_ID_CHAPSTRING 0x85
#define MATROSKA_ID_CHAPTERSEGMENTUID 0x6E67
+#define MATROSKA_ID_CHAPTERSEGMENTEDITIONUID\
+ 0x6EBC
/* IDs in the cluster master */
#define MATROSKA_ID_CLUSTERTIMECODE 0xE7