summaryrefslogtreecommitdiffstats
path: root/libswscale/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-23 21:00:52 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-23 21:00:52 +0200
commit66f6f9f0768de5b003fc1b0fa9b1ea428466308a (patch)
tree157b98be78b0cd1e99b3dd51979bc97792d11642 /libswscale/Makefile
parentebb541c6553af10203b2c2f5bcead6118a44f5be (diff)
parent30aa2383cadb2f879e02dca9df293c01119a3111 (diff)
downloadmpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.bz2
mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.xz
Merge svn changes up to r28712
Diffstat (limited to 'libswscale/Makefile')
-rw-r--r--libswscale/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile
index a959661b51..9ebe825266 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,10 +5,9 @@ FFLIBS = avutil
HEADERS = swscale.h
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o
+OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb2.o
OBJS-$(ARCH_BFIN) += internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o
-OBJS-$(CONFIG_GPL) += yuv2rgb.o
OBJS-$(CONFIG_MLIB) += yuv2rgb_mlib.o
OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o
OBJS-$(HAVE_VIS) += yuv2rgb_vis.o