summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-19 22:23:41 +0100
committerwm4 <wm4@nowhere>2013-11-19 22:38:27 +0100
commit50837129b231ae9a811abac2767af5fa6ced621b (patch)
tree6989334045414d4dc93d46f7c12ed1f2118dd169 /Makefile
parent469e488308bcb215f1038cc3e4d9399361599532 (diff)
downloadmpv-50837129b231ae9a811abac2767af5fa6ced621b.tar.bz2
mpv-50837129b231ae9a811abac2767af5fa6ced621b.tar.xz
timeline: add new EDL format
Edit Decision Lists (EDL) allow combining parts from multiple source files into one virtual file. MPlayer had an EDL format (which sucked), which mplayer2 tried to improve with its own format (which sucked). As logic demands, mpv introduces its very own format (which sucks). The new format should actually be much simpler and easier to use, and its implementation is simpler and smaller too.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7ccea8d1b6..07d05d7fe0 100644
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,7 @@ SOURCES = audio/audio.c \
mpvcore/player/video.c \
mpvcore/player/timeline/tl_edl.c \
mpvcore/player/timeline/tl_matroska.c \
+ mpvcore/player/timeline/tl_mpv_edl.c \
mpvcore/player/timeline/tl_cue.c \
osdep/io.c \
osdep/numcores.c \