From 5a186d5942bda0c7cae56bc524a6dceccb5c7d3f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 17 Feb 2015 23:46:50 +0100
Subject: matroska: make timeline code independent of MPContext

---
 demux/demux_mkv.c | 3 ++-
 demux/matroska.h  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'demux')

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 169850ac52..b1a299feca 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2889,7 +2889,8 @@ const demuxer_desc_t demuxer_desc_matroska = {
     .fill_buffer = demux_mkv_fill_buffer,
     .close = mkv_free,
     .seek = demux_mkv_seek,
-    .control = demux_mkv_control
+    .control = demux_mkv_control,
+    .load_timeline = build_ordered_chapter_timeline,
 };
 
 bool demux_matroska_uid_cmp(struct matroska_segment_uid *a,
diff --git a/demux/matroska.h b/demux/matroska.h
index a5d33b90ff..b4f13d97a8 100644
--- a/demux/matroska.h
+++ b/demux/matroska.h
@@ -23,6 +23,9 @@
 #ifndef MPLAYER_MATROSKA_H
 #define MPLAYER_MATROSKA_H
 
+struct timeline;
+void build_ordered_chapter_timeline(struct timeline *tl);
+
 #define MKV_A_AAC_2MAIN  "A_AAC/MPEG2/MAIN"
 #define MKV_A_AAC_2LC    "A_AAC/MPEG2/LC"
 #define MKV_A_AAC_2SBR   "A_AAC/MPEG2/LC/SBR"
-- 
cgit v1.2.3