summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-14 09:34:39 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-26 16:34:42 +0200
commite8af22db818f839f5ac25a309e8838ea53e831b2 (patch)
tree5a7ecf9640d800f311ef3941be1641000608a49f /Makefile
parentf7643ddde624451b01f2cab688b733326b7b8ca5 (diff)
downloadmpv-e8af22db818f839f5ac25a309e8838ea53e831b2.tar.bz2
mpv-e8af22db818f839f5ac25a309e8838ea53e831b2.tar.xz
core: ordered chapters: move timeline creation to timeline/
Add new file timeline/tl_matroska.c. Move the code that parses ordered chapter information from Matroska files and creates the timeline structure based on that to the new file. Initialize the format parameter given to open_stream() in the moved code. The previous uninitialized value shouldn't have caused any visible effects.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 67d1bbb06c..9c8beb0335 100644
--- a/Makefile
+++ b/Makefile
@@ -442,6 +442,7 @@ SRCS_COMMON = asxparser.c \
sub/subassconvert.c \
sub/subreader.c \
sub/vobsub.c \
+ timeline/tl_matroska.c \
$(SRCS_COMMON-yes)
@@ -586,6 +587,7 @@ DIRS = . \
stream/librtsp \
stream/realrtsp \
sub \
+ timeline \
TOOLS \
MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mplayer.mo)