* release/0.7: (290 commits) nuv: Fix combination of size changes and LZO compression. av_lzo1x_decode: properly handle negative buffer length. Do not call parse_keyframes_index with NULL stream. update versions for 0.7 branch Version numbers for 0.8.6 snow: emu edge support Fixes Ticket592 imc: validate channel count imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263) libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b1309293bbf30edef767503875277b01cf) configure: fix arch x86_32 mp3enc: avoid truncating id3v1 tags by one byte asfdec: Check packet_replic_size earlier cin audio: validate the channel count binkaudio: add some buffer overread checks. atrac1: validate number of channels (cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872) atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e) vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f) apedec: set s->currentframeblocks after validating nblocks apedec: use unsigned int for 'nblocks' and make sure that it's within int range apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d) ... Conflicts: Changelog Makefile RELEASE configure libavcodec/error_resilience.c libavcodec/mpegvideo.c libavformat/matroskaenc.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
30 lines
926 B
Makefile
30 lines
926 B
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = swscale
|
|
FFLIBS = avutil
|
|
|
|
HEADERS = swscale.h
|
|
|
|
OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o \
|
|
swscale_unscaled.o
|
|
|
|
OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \
|
|
bfin/swscale_bfin.o \
|
|
bfin/yuv2rgb_bfin.o
|
|
OBJS-$(CONFIG_MLIB) += mlib/yuv2rgb_mlib.o
|
|
OBJS-$(HAVE_ALTIVEC) += ppc/swscale_altivec.o \
|
|
ppc/yuv2rgb_altivec.o \
|
|
ppc/yuv2yuv_altivec.o
|
|
OBJS-$(HAVE_MMX) += x86/rgb2rgb.o \
|
|
x86/swscale_mmx.o \
|
|
x86/yuv2rgb_mmx.o
|
|
OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o
|
|
|
|
$(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS)
|
|
|
|
TESTPROGS = colorspace swscale
|
|
|
|
DIRS = bfin mlib ppc sparc x86
|
|
|
|
include $(SRC_PATH)/subdir.mak
|