mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
bb9d5171a7
* qatar/master: (21 commits)
swscale: Add Doxygen for hyscale_fast/hScale.
fate: enable lavfi-pixmt tests on big endian systems
PPC: swscale: disable altivec functions for unsupported formats
fate: merge identical pixdesc_be/le tests
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
build: call texi2pod.pl with full path instead of symlink
build: include sub-makefiles using full path instead of symlinks
swscale: update big endian reference values after dff5a835.
wavpack: skip blocks with no samples
cosmetics: remove outdated comment that is no longer true
build: replace some addprefix/addsuffix with substitution refs
avutil: Remove unused arbitrary precision integer code.
configure: Drop check for availability of ten assembler operands.
aacenc: Save channel configuration for later use.
aacenc: Fix codebook trellising for zeroed bands.
swscale: change prototypes of scaled YUV output functions.
swscale: re-add support for non-native endianness.
swscale: disentangle yuv2rgbX_c_full() into small functions.
swscale: split yuv2packed[12X]_c() remainders into small functions.
swscale: split yuv2packedX_altivec in smaller functions.
...
Conflicts:
Makefile
configure
libavcodec/x86/dsputil_mmx.c
libavfilter/Makefile
libavformat/Makefile
libavutil/integer.c
libavutil/integer.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
28 lines
868 B
Makefile
28 lines
868 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
|
|
|
|
TESTPROGS = colorspace swscale
|
|
|
|
DIRS = bfin mlib ppc sparc x86
|
|
|
|
include $(SRC_PATH)/subdir.mak
|