diff options
author | wm4 <wm4@nowhere> | 2015-02-17 23:47:37 +0100 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-19 13:39:38 +0900 |
commit | 8161b47e73f96ffb6ae505008a1fa0dd48e1694d (patch) | |
tree | ab129bfeb490a94adb7504d9bc07e0f290449937 /old-makefile | |
parent | f113e03b8929ea7dc46c7de9bc5209dfef303165 (diff) | |
download | mpv-8161b47e73f96ffb6ae505008a1fa0dd48e1694d.tar.bz2 mpv-8161b47e73f96ffb6ae505008a1fa0dd48e1694d.tar.xz |
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)
Diffstat (limited to 'old-makefile')
-rw-r--r-- | old-makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |