diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libswscale/Makefile | |
parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz |
Merge svn changes up to r29277
Diffstat (limited to 'libswscale/Makefile')
-rw-r--r-- | libswscale/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index ce0f7cebc1..247ae8d239 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -5,7 +5,7 @@ FFLIBS = avutil HEADERS = swscale.h -OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o +OBJS = options.o rgb2rgb.o swscale.o yuv2rgb.o OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \ bfin/swscale_bfin.o \ @@ -16,8 +16,6 @@ OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o MMX-OBJS-$(CONFIG_GPL) += x86/yuv2rgb_mmx.o \ -OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) - EXAMPLES = swscale TESTPROGS = colorspace |