diff options
| author | wm4 <wm4@nowhere> | 2015-02-17 23:46:50 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-19 13:39:38 +0900 |
| commit | f113e03b8929ea7dc46c7de9bc5209dfef303165 (patch) | |
| tree | 6028f9e81b3b7930dd2f8ca3d8b0d6d5de07f072 /demux | |
| parent | 630a7b7d82d48b9561940a08d5291495dc2b1079 (diff) | |
| download | mpv-f113e03b8929ea7dc46c7de9bc5209dfef303165.tar.bz2 mpv-f113e03b8929ea7dc46c7de9bc5209dfef303165.tar.xz | |
matroska: make timeline code independent of MPContext
(cherry picked from commit 5a186d5942bda0c7cae56bc524a6dceccb5c7d3f)
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_mkv.c | 3 | ||||
| -rw-r--r-- | demux/matroska.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 5335a6b8c7..c3c60e49c5 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2887,7 +2887,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" |