diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-04-08 22:50:06 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-04-08 22:50:06 +0300 |
| commit | 9ef15ac4fc28ecf85a497bc664246f227b40c135 (patch) | |
| tree | 6d1a17e39b87aca52d853902ee1475fbb348ec21 /Makefile | |
| parent | 511498818f3372a911ca142ab25f59bbb10d7e3f (diff) | |
| parent | dc3471780d755e897538c315b86241a43616e81b (diff) | |
| download | mpv-9ef15ac4fc28ecf85a497bc664246f227b40c135.tar.bz2 mpv-9ef15ac4fc28ecf85a497bc664246f227b40c135.tar.xz | |
Merge branch 'edl'
* edl:
core: support timeline with audio-only files
core: wake up a bit less often for audio-only files
core: audio: cut audio writes at end of timeline part
EDL: add support for new EDL file format
stream.[ch], ass_mp: new stream function for whole-file reads
tl_matroska.c: move the find_files() function here
bstr.[ch], path.[ch]: add string and path handling functions
core: ordered chapters: move timeline creation to timeline/
options: drop support for numeric -demuxer values
cleanup: demuxer.[ch]: remove unused code, make functions static
cleanup: reindent demuxer.h, use struct names for types
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -374,6 +374,7 @@ SRCS_COMMON = asxparser.c \ libmpdemux/demux_audio.c \ libmpdemux/demux_avi.c \ libmpdemux/demux_demuxers.c \ + libmpdemux/demux_edl.c \ libmpdemux/demux_film.c \ libmpdemux/demux_fli.c \ libmpdemux/demux_lmlm4.c \ @@ -407,7 +408,6 @@ SRCS_COMMON = asxparser.c \ libmpdemux/yuv4mpeg.c \ libmpdemux/yuv4mpeg_ratio.c \ libvo/osd.c \ - osdep/findfiles.c \ osdep/numcores.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ @@ -426,6 +426,8 @@ SRCS_COMMON = asxparser.c \ sub/subassconvert.c \ sub/subreader.c \ sub/vobsub.c \ + timeline/tl_edl.c \ + timeline/tl_matroska.c \ $(SRCS_COMMON-yes) @@ -569,6 +571,7 @@ DIRS = . \ stream/librtsp \ stream/realrtsp \ sub \ + timeline \ TOOLS \ MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mplayer.mo) |