diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:37:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:37:34 +0300 |
commit | a286506467e179010c23381c6ca01f29c0071dc6 (patch) | |
tree | 1f3c7eac06e4ae03d5b6a2d6773d96bcd7e5fcbd /Makefile | |
parent | 36cce813534bcb24a391c500ab9572e56b49923b (diff) | |
parent | 0a33fdb83a5488744e3a148d1a09801850135a56 (diff) | |
download | mpv-a286506467e179010c23381c6ca01f29c0071dc6.tar.bz2 mpv-a286506467e179010c23381c6ca01f29c0071dc6.tar.xz |
Merge svn changes up to r31176
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -171,7 +171,7 @@ SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBSWSCALE_INTERNALS) += libmpcodecs/vf_palette.c \ libmpcodecs/vf_rgb2bgr.c \ - libmpcodecs/vf_yuy2.c + SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ @@ -802,7 +802,7 @@ codec-cfg.d codec-cfg.o: codecs.conf.h $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi osdep/mplayer.rc): version.h # Files that depend on libswscale internals -libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o libmpcodecs/vf_yuy2.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) +libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) # Files that depend on libavcodec internals libmpcodecs/vf_fspp.o libmpcodecs/vf_geq.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_qp.o libmpcodecs/vf_spp.o libvo/jpeg_enc.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) |