diff options
| author | wm4 <wm4@nowhere> | 2015-02-17 23:48:07 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-19 13:39:38 +0900 |
| commit | 55fe8aab6aa267e638b4d0b9f882aa266dd81e66 (patch) | |
| tree | 56c4d000690a2cfd1e5ce708791aad51e280cda0 /player | |
| parent | b2aa388f27f5fe2711426eb2bec685d9d1be5f0c (diff) | |
| download | mpv-55fe8aab6aa267e638b4d0b9f882aa266dd81e66.tar.bz2 mpv-55fe8aab6aa267e638b4d0b9f882aa266dd81e66.tar.xz | |
demux_cue: make independent from MPContext
Also see previous commit(s).
(cherry picked from commit 10781c2a9c175a8f9e445df4a91031301f225351)
Diffstat (limited to 'player')
| -rw-r--r-- | player/core.h | 2 | ||||
| -rw-r--r-- | player/loadfile.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/player/core.h b/player/core.h index 41df775ee2..64b36c57c6 100644 --- a/player/core.h +++ b/player/core.h @@ -476,8 +476,6 @@ void update_osd_sub_state(struct MPContext *mpctx, int order, // timeline/tl_mpv_edl.c void build_mpv_edl_timeline(struct MPContext *mpctx); -// timeline/tl_cue.c -void build_cue_timeline(struct MPContext *mpctx); // video.c void reset_video_state(struct MPContext *mpctx); diff --git a/player/loadfile.c b/player/loadfile.c index be2ad3b9d0..d0d6997dd5 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -987,9 +987,6 @@ static void load_timeline(struct MPContext *mpctx) if (mpctx->demuxer->type == DEMUXER_TYPE_EDL) build_mpv_edl_timeline(mpctx); - if (mpctx->demuxer->type == DEMUXER_TYPE_CUE) - build_cue_timeline(mpctx); - mpctx->tl = timeline_load(mpctx->global, mpctx->log, mpctx->demuxer); if (mpctx->tl) { mpctx->timeline = mpctx->tl->parts; |