diff options
| author | wm4 <wm4@nowhere> | 2015-02-17 23:48:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-17 23:48:47 +0100 |
| commit | d7a4cb14ff8dc61d87cec54abcd7f7623e8cc666 (patch) | |
| tree | fb1d286e513b8f1531047f2cf91449f1a2475f3f /player | |
| parent | 1e44c811f3683f62714ff5ecc2e4f233eb8bb668 (diff) | |
| download | mpv-d7a4cb14ff8dc61d87cec54abcd7f7623e8cc666.tar.bz2 mpv-d7a4cb14ff8dc61d87cec54abcd7f7623e8cc666.tar.xz | |
demux_edl: make independent from MPContext
Diffstat (limited to 'player')
| -rw-r--r-- | player/core.h | 3 | ||||
| -rw-r--r-- | player/loadfile.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/player/core.h b/player/core.h index fd1ef86324..d7413dfa19 100644 --- a/player/core.h +++ b/player/core.h @@ -477,9 +477,6 @@ void uninit_sub_renderer(struct MPContext *mpctx); void update_osd_sub_state(struct MPContext *mpctx, int order, struct osd_sub_state *out_state); -// timeline/tl_mpv_edl.c -void build_mpv_edl_timeline(struct MPContext *mpctx); - // video.c void reset_video_state(struct MPContext *mpctx); int reinit_video_chain(struct MPContext *mpctx); diff --git a/player/loadfile.c b/player/loadfile.c index 6bd228fe62..aba8b6c7df 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -988,9 +988,6 @@ static void load_timeline(struct MPContext *mpctx) MP_TARRAY_APPEND(NULL, mpctx->sources, mpctx->num_sources, mpctx->demuxer); - if (mpctx->demuxer->type == DEMUXER_TYPE_EDL) - build_mpv_edl_timeline(mpctx); - mpctx->tl = timeline_load(mpctx->global, mpctx->log, mpctx->demuxer); if (mpctx->tl) { mpctx->timeline = mpctx->tl->parts; |