7f83db3124
* qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
30 lines
995 B
Makefile
30 lines
995 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
|
|
MMX-OBJS-$(HAVE_YASM) += x86/output.o \
|
|
x86/scale.o
|
|
|
|
$(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS)
|
|
|
|
TESTPROGS = colorspace swscale
|
|
|
|
DIRS = bfin mlib ppc sparc x86
|