mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
367d9b2957
* 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>
18 lines
581 B
Makefile
18 lines
581 B
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = swscale
|
|
FFLIBS = avutil
|
|
|
|
HEADERS = swscale.h
|
|
|
|
OBJS = input.o \
|
|
options.o \
|
|
output.o \
|
|
rgb2rgb.o \
|
|
swscale.o \
|
|
swscale_unscaled.o \
|
|
utils.o \
|
|
yuv2rgb.o \
|
|
|
|
TESTPROGS = colorspace swscale
|