virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
7b607eb5e7
FFmpeg/libswscale/x86/Makefile

12 lines
556 B
Makefile
Raw Normal View History

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>
2012-04-13 22:21:15 +03:00
$(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS)
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
2012-02-06 21:16:44 +03:00
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
MMX-OBJS += x86/rgb2rgb.o \
swscale: x86: Drop pointless _mmx suffix from filenames The files do not contain only MMX code.
2012-07-21 23:33:03 +03:00
x86/swscale.o \
x86/yuv2rgb.o \
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
2012-02-06 21:16:44 +03:00
YASM-OBJS += x86/input.o \
x86/output.o \
x86/scale.o \
Reference in New Issue Copy Permalink