mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-19 05:40:56 +00:00
18d0a16fc9
* qatar/master: swscale: make yuv2yuv1 use named registers. h264: mark h264_idct_add8_10 with number of XMM registers. swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case. vp8: always update next_framep[] before returning from decode_frame(). avconv: estimate next_dts from framerate if it is set. avconv: better next_dts usage. avconv: rename InputStream.pts to last_dts. avconv: reduce overloading for InputStream.pts. avconv: rename InputStream.next_pts to next_dts. avconv: rework -t handling for encoding. avconv: set encoder timebase for subtitles. pva-demux test: add -vn swscale: K&R formatting cosmetics for SPARC code apedec: allow the user to set the maximum number of output samples per call apedec: do not unnecessarily zero output samples for mono frames apedec: allocate a single flat buffer for decoded samples apedec: use sizeof(field) instead of sizeof(type) swscale: split C output functions into separate file. swscale: Split C input functions into separate file. bytestream: Add bytestream2 writing API. The avconv changes are due to massive regressions and bugs not merged yet. Conflicts: ffmpeg.c libavcodec/vp8.c libswscale/swscale.c libswscale/x86/swscale_template.c tests/fate/demux.mak tests/ref/lavf/asf tests/ref/lavf/avi tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_avi tests/ref/seek/lavf_mkv tests/ref/seek/lavf_rm Merged-by: Michael Niedermayer <michaelni@gmx.at>
33 lines
1.1 KiB
Makefile
33 lines
1.1 KiB
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
|
|
|
|
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/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
|
|
|
|
DIRS = bfin mlib ppc sparc x86
|