diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /Makefile | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -218,7 +218,6 @@ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ defaultopts.c \ - edl.c \ fmt-conversion.c \ m_config.c \ m_option.c \ @@ -405,6 +404,7 @@ SRCS_COMMON = asxparser.c \ libvo/osd.c \ libvo/eosd_packer.c \ osdep/numcores.c \ + osdep/io.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ stream/open.c \ |