diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-30 07:55:31 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:45 +0200 |
| commit | 62112dedb0a6c874289734b2a64d9ce93b8ae4f0 (patch) | |
| tree | 5fea8737eb83e1363ce83fa892c88ba53abe01c6 /Makefile | |
| parent | 9b00269483584abdbc485cc1883201bb5e0ba495 (diff) | |
| download | mpv-62112dedb0a6c874289734b2a64d9ce93b8ae4f0.tar.bz2 mpv-62112dedb0a6c874289734b2a64d9ce93b8ae4f0.tar.xz | |
enable vo_mga, vo_xmga, vf_palette, vf_halfpack
Nothing should depend on libswscale internals any more, so re-enable
everything. vf_palette and vf_halfpack were actually fixed earlier but
were not properly enabled.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -169,7 +169,6 @@ SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c -SRCS_COMMON-$(LIBSWSCALE_INTERNALS) += libmpcodecs/vf_palette.c \ SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ @@ -432,6 +431,7 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_noformat.c \ libmpcodecs/vf_noise.c \ libmpcodecs/vf_ow.c \ + libmpcodecs/vf_palette.c \ libmpcodecs/vf_perspective.c \ libmpcodecs/vf_phase.c \ libmpcodecs/vf_pp7.c \ @@ -799,16 +799,11 @@ codec-cfg.d codec-cfg.o: codecs.conf.h $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h # Files that depend on libswscale internals -libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) +libmpcodecs/vf_palette.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) -# yuv4mpeg has rgb conversion code under #ifdef CONFIG_LIBSWSCALE_INTERNALS -ifeq ($(LIBSWSCALE_INTERNALS),yes) -libvo/vo_yuv4mpeg.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) -endif - osdep/mplayer-rc.o: osdep/mplayer.exe.manifest libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) |