diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-16 23:30:48 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-22 04:42:25 +0200 |
commit | 327940361170a4d830bc7c120503cdd0396a125a (patch) | |
tree | 725c912fe7452f679f650c00e6f39af6b308f960 /libmpdemux/demuxer.h | |
parent | 4b33422c7b004f31eb8fb1962231f69ab6f18445 (diff) | |
download | mpv-327940361170a4d830bc7c120503cdd0396a125a.tar.bz2 mpv-327940361170a4d830bc7c120503cdd0396a125a.tar.xz |
demux_mkv: Parse ordered chapter information
Parse the ordered chapter structure if present and place the
information in the public demuxer structure. Nothing uses the
information yet.
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r-- | libmpdemux/demuxer.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 4815c8b7d9..8d1f1d0b88 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -5,6 +5,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include "stream/stream.h" @@ -187,6 +188,18 @@ typedef struct demux_chapter char* name; } demux_chapter_t; +struct matroska_data { + unsigned char segment_uid[16]; + // Ordered chapter information if any + struct matroska_chapter { + uint64_t start; + uint64_t end; + bool has_segment_uid; + unsigned char segment_uid[16]; + } *ordered_chapters; + int num_ordered_chapters; +}; + typedef struct demux_attachment { char* name; @@ -220,10 +233,12 @@ typedef struct demuxer { demux_chapter_t* chapters; int num_chapters; - + demux_attachment_t* attachments; int num_attachments; + struct matroska_data matroska_data; + void* priv; // fileformat-dependent data char** info; struct MPOpts *opts; |