summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:54:09 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:55:15 +0200
commitba21aba40d4217f7efb8fee8eb9138fcef8c02bd (patch)
tree16b45c02628779b535c73a6fb2ef11ece2f33dcb /Makefile
parentb390b9b28fa6280f355eeef4811b6cfc02dea01a (diff)
parent6da17782ea42b89271a794f20837c76657161eb2 (diff)
downloadmpv-ba21aba40d4217f7efb8fee8eb9138fcef8c02bd.tar.bz2
mpv-ba21aba40d4217f7efb8fee8eb9138fcef8c02bd.tar.xz
Merge svn changes up to r30187
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 548bc9d669..2955cfb5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -548,6 +548,7 @@ SRCS_MPLAYER-$(JACK) += libao2/ao_jack.c
SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c
SRCS_MPLAYER-$(JPEG) += libvo/vo_jpeg.c
SRCS_MPLAYER-$(KVA) += libvo/vo_kva.c
+SRCS_MPLAYER-$(LIBAVCODEC) += libvo/vo_png.c
SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \
libmenu/menu_chapsel.c \
libmenu/menu_cmdlist.c \
@@ -566,7 +567,6 @@ SRCS_MPLAYER-$(MGA) += libvo/vo_mga.c
SRCS_MPLAYER-$(NAS) += libao2/ao_nas.c
SRCS_MPLAYER-$(OPENAL) += libao2/ao_openal.c
SRCS_MPLAYER-$(OSS) += libao2/ao_oss.c
-SRCS_MPLAYER-$(PNG) += libvo/vo_png.c
SRCS_MPLAYER-$(PNM) += libvo/vo_pnm.c
SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c
SRCS_MPLAYER-$(QUARTZ) += libvo/vo_quartz.c libvo/osx_common.c