diff options
| author | wm4 <wm4@nowhere> | 2015-02-17 23:47:37 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-17 23:47:37 +0100 |
| commit | edc0007e74ab4ad043f35eed8cdebd9ed73c8062 (patch) | |
| tree | 8adfabc2180bbef3dac6194550e175b4f6be92f5 | |
| parent | 5a186d5942bda0c7cae56bc524a6dceccb5c7d3f (diff) | |
| download | mpv-edc0007e74ab4ad043f35eed8cdebd9ed73c8062.tar.bz2 mpv-edc0007e74ab4ad043f35eed8cdebd9ed73c8062.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.
| -rw-r--r-- | demux/demux_mkv_timeline.c (renamed from player/timeline/tl_matroska.c) | 0 | ||||
| -rw-r--r-- | old-makefile | 2 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/player/timeline/tl_matroska.c b/demux/demux_mkv_timeline.c index 57bb93e1cd..57bb93e1cd 100644 --- a/player/timeline/tl_matroska.c +++ b/demux/demux_mkv_timeline.c diff --git a/old-makefile b/old-makefile index 443798f632..5635986ef6 100644 --- a/old-makefile +++ b/old-makefile @@ -172,6 +172,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 \ @@ -218,7 +219,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 \ diff --git a/wscript_build.py b/wscript_build.py index 0539e9e0a8..746a08790e 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -173,6 +173,7 @@ def build(ctx): ( "demux/demux_libass.c", "libass"), ( "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" ), @@ -226,7 +227,6 @@ def build(ctx): ( "player/sub.c" ), ( "player/timeline/tl_cue.c" ), ( "player/timeline/tl_mpv_edl.c" ), - ( "player/timeline/tl_matroska.c" ), ( "player/video.c" ), ## Streams |