summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-17 23:46:50 +0100
committerwm4 <wm4@nowhere>2015-02-17 23:46:50 +0100
commit5a186d5942bda0c7cae56bc524a6dceccb5c7d3f (patch)
tree6ac711332f12a5d3dc2243cb39a4f9e85807dd9c /demux
parenta0a089f6a48c2775478b544185a0ddeabf43cce8 (diff)
downloadmpv-5a186d5942bda0c7cae56bc524a6dceccb5c7d3f.tar.bz2
mpv-5a186d5942bda0c7cae56bc524a6dceccb5c7d3f.tar.xz
matroska: make timeline code independent of MPContext
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c3
-rw-r--r--demux/matroska.h3
2 files changed, 5 insertions, 1 deletions
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"