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/core.h | |
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/core.h')
-rw-r--r-- | player/core.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/player/core.h b/player/core.h index 445c0c7105..ae0a5c5dbb 100644 --- a/player/core.h +++ b/player/core.h @@ -47,11 +47,6 @@ struct timeline_part { struct demuxer *source; }; -struct chapter { - double start; - char *name; -}; - enum mp_osd_seek_info { OSD_SEEK_INFO_BAR = 1, OSD_SEEK_INFO_TEXT = 2, @@ -195,7 +190,7 @@ typedef struct MPContext { struct timeline_part *timeline; int num_timeline_parts; int timeline_part; - struct chapter *chapters; + struct demux_chapter *chapters; int num_chapters; double video_offset; |