From 8161b47e73f96ffb6ae505008a1fa0dd48e1694d Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Feb 2015 23:47:37 +0100 Subject: matroska: move timeline code to demux/ Separate from previous commit, because git is bad at tracking file renames when the file contents are also changed. (cherry picked from commit edc0007e74ab4ad043f35eed8cdebd9ed73c8062) --- old-makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-makefile') diff --git a/old-makefile b/old-makefile index 944a7a8435..0eb26a4e34 100644 --- a/old-makefile +++ b/old-makefile @@ -171,6 +171,7 @@ SOURCES = audio/audio.c \ demux/demux_lavf.c \ demux/demux_mf.c \ demux/demux_mkv.c \ + demux/demux_mkv_timeline.c \ demux/demux_playlist.c \ demux/demux_raw.c \ demux/demux_subreader.c \ @@ -217,7 +218,6 @@ SOURCES = audio/audio.c \ player/scripting.c \ player/sub.c \ player/video.c \ - player/timeline/tl_matroska.c \ player/timeline/tl_mpv_edl.c \ player/timeline/tl_cue.c \ stream/cache.c \ -- cgit v1.2.3