From 3be989dcd04c1c061f570d6dbc5a98e4a15aefc5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Feb 2015 23:48:47 +0100 Subject: demux_edl: make independent from MPContext (cherry picked from commit d7a4cb14ff8dc61d87cec54abcd7f7623e8cc666) --- player/core.h | 3 --- player/loadfile.c | 3 --- 2 files changed, 6 deletions(-) (limited to 'player') diff --git a/player/core.h b/player/core.h index 64b36c57c6..98b3c7cd86 100644 --- a/player/core.h +++ b/player/core.h @@ -474,9 +474,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 d0d6997dd5..a1a4ca00ba 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -984,9 +984,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; -- cgit v1.2.3