From af5c393d2c0b508b0fbd68f18fb9d0b4f34c61ca Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 23 Jan 2014 00:54:08 +0100
Subject: demux_mkv: nicer edition output

If there's more than one edition, print the list of editions, including
the edition name, whether the edition is selected, whether the edition
is default, and the command line option to select the edition. (Similar
to stream list.)

Move reading the tags to a separate function process_tags(), which is
called when all other state is parsed. Otherwise, that tags will be lost
if chapters are read after the tags.
---
 demux/demux.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'demux/demux.h')

diff --git a/demux/demux.h b/demux/demux.h
index 6f9437f2d3..a979a357c1 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -120,6 +120,12 @@ typedef struct demux_chapter
     uint64_t demuxer_id; // for mapping to internal demuxer data structures
 } demux_chapter_t;
 
+struct demux_edition {
+    uint64_t demuxer_id;
+    bool default_edition;
+    struct mp_tags *metadata;
+};
+
 struct matroska_segment_uid {
     unsigned char segment[16];
     uint64_t edition;
@@ -175,6 +181,7 @@ typedef struct demuxer {
     int num_streams;
     bool stream_autoselect;
 
+    struct demux_edition *editions;
     int num_editions;
     int edition;
 
-- 
cgit v1.2.3