diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:21:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:50:37 +0200 |
| commit | 367d9b2957fa455b59f131fd6bee896cb7ed6600 (patch) | |
| tree | 4c6f6a32752bc64d7aea93e37d4bd5666cd6ecb9 /libswscale/Makefile | |
| parent | 62e5ef95cacb29b5ee3149792f12f9204dbd1655 (diff) | |
| parent | ef0ee7f657e66d91162d2b4fad882ece9fbb264e (diff) | |
| download | ffmpeg-streaming-367d9b2957fa455b59f131fd6bee896cb7ed6600.zip ffmpeg-streaming-367d9b2957fa455b59f131fd6bee896cb7ed6600.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: K&R formatting cosmetics (part II)
tiffdec: Add a malloc check and refactor another.
faxcompr: Check malloc results and unify return path
configure: escape colons in values written to config.fate
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
matroska: Fix leaking memory allocated for laces.
pthread: Fix crash due to fctx->delaying not being cleared.
vp3: Assert on invalid filter_limit values.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
ffv1: Fix size mismatch in encode_line.
movenc: Remove a dead initialization
git-howto: Explain how to avoid Windows line endings in git checkouts.
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Conflicts:
configure
libavcodec/vp3.c
libavformat/matroskadec.c
libavutil/Makefile
libswscale/Makefile
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
| -rw-r--r-- | libswscale/Makefile | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index 507c448..a77d51c 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -14,22 +14,4 @@ OBJS = input.o \ utils.o \ yuv2rgb.o \ -OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \ - bfin/swscale_bfin.o \ - bfin/yuv2rgb_bfin.o -ALTIVEC-OBJS += ppc/swscale_altivec.o \ - ppc/yuv2rgb_altivec.o \ - ppc/yuv2yuv_altivec.o -MMX-OBJS += x86/rgb2rgb.o \ - x86/swscale_mmx.o \ - x86/yuv2rgb_mmx.o -VIS-OBJS += sparc/yuv2rgb_vis.o -YASM-OBJS += x86/input.o \ - x86/output.o \ - x86/scale.o - -$(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS) - -OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o - TESTPROGS = colorspace swscale |
