diff options
author | wm4 <wm4@nowhere> | 2014-11-02 17:20:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-11-02 17:29:41 +0100 |
commit | 969757baa0af99d905a9b8c99f0c92efa4e0fb33 (patch) | |
tree | 2db51b2e3bc89dce550fc1c9fbf31c7471a41fce /player/timeline/tl_matroska.c | |
parent | 1cebd16350229d2ab1441f5061079ce9240fb22f (diff) | |
download | mpv-969757baa0af99d905a9b8c99f0c92efa4e0fb33.tar.bz2 mpv-969757baa0af99d905a9b8c99f0c92efa4e0fb33.tar.xz |
player: always use demux_chapter
Instead of defining a separate data structure in the core.
For some odd reason, demux_chapter exported the chapter time in
nano-seconds. Change that to the usual timestamps (rename the field
to make any code relying on this to fail compilation), and also remove
the unused chapter end time.
Diffstat (limited to 'player/timeline/tl_matroska.c')
-rw-r--r-- | player/timeline/tl_matroska.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c index 6f64ae8484..e97a8ce594 100644 --- a/player/timeline/tl_matroska.c +++ b/player/timeline/tl_matroska.c @@ -380,7 +380,7 @@ static void build_timeline_loop(struct MPContext *mpctx, uint64_t *missing_time, uint64_t *last_end_time, struct timeline_part **timeline, - struct chapter *chapters, + struct demux_chapter *chapters, int *part_count, uint64_t skip, uint64_t limit) @@ -419,7 +419,7 @@ static void build_timeline_loop(struct MPContext *mpctx, * needed to add chapters for external non-ordered segment loading * as well since that part is not recursive. */ if (!limit) { - chapters[i].start = *starttime / 1e9; + chapters[i].pts = *starttime / 1e9; chapters[i].name = talloc_strdup(chapters, c->name); } @@ -560,8 +560,8 @@ void build_ordered_chapter_timeline(struct MPContext *mpctx) talloc_free(uids); struct timeline_part *timeline = talloc_array_ptrtype(NULL, timeline, 0); - struct chapter *chapters = - talloc_zero_array(NULL, struct chapter, m->num_ordered_chapters); + struct demux_chapter *chapters = + talloc_zero_array(NULL, struct demux_chapter, m->num_ordered_chapters); uint64_t starttime = 0; uint64_t missing_time = 0; uint64_t last_end_time = 0; |