summaryrefslogtreecommitdiffstats
path: root/mpvcore/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-19 22:41:26 +0100
committerwm4 <wm4@nowhere>2013-11-19 22:44:08 +0100
commit52467b2ac917908ea029f91ed6b2a7a2e58d1756 (patch)
treeea43d1d4066372c54bb8d0b33960dd9e9a64a250 /mpvcore/player/loadfile.c
parentf197198ca3e79b923e5d0ae66fec847737ee1f41 (diff)
downloadmpv-52467b2ac917908ea029f91ed6b2a7a2e58d1756.tar.bz2
mpv-52467b2ac917908ea029f91ed6b2a7a2e58d1756.tar.xz
timeline: remove support for the mplayer2 EDL format
It was a bit too complicated and inconvenient, and I doubt anyone actively used it. The mpv EDL format should cover all use cases.
Diffstat (limited to 'mpvcore/player/loadfile.c')
-rw-r--r--mpvcore/player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mpvcore/player/loadfile.c b/mpvcore/player/loadfile.c
index 5dd94106dd..f6e7f6c117 100644
--- a/mpvcore/player/loadfile.c
+++ b/mpvcore/player/loadfile.c
@@ -1159,7 +1159,7 @@ goto_reopen_demuxer: ;
build_ordered_chapter_timeline(mpctx);
if (mpctx->demuxer->type == DEMUXER_TYPE_EDL)
- build_edl_timeline(mpctx);
+ build_mpv_edl_timeline(mpctx);
if (mpctx->demuxer->type == DEMUXER_TYPE_CUE)
build_cue_timeline(mpctx);