mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 23:33:07 +00: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>
90 lines
5.3 KiB
Makefile
90 lines
5.3 KiB
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = avutil
|
|
|
|
HEADERS = adler32.h \
|
|
aes.h \
|
|
attributes.h \
|
|
audioconvert.h \
|
|
avassert.h \
|
|
avstring.h \
|
|
avutil.h \
|
|
base64.h \
|
|
bswap.h \
|
|
common.h \
|
|
cpu.h \
|
|
crc.h \
|
|
error.h \
|
|
eval.h \
|
|
fifo.h \
|
|
file.h \
|
|
imgutils.h \
|
|
intfloat_readwrite.h \
|
|
intreadwrite.h \
|
|
lfg.h \
|
|
log.h \
|
|
lzo.h \
|
|
mathematics.h \
|
|
md5.h \
|
|
mem.h \
|
|
dict.h \
|
|
opt.h \
|
|
parseutils.h \
|
|
pixdesc.h \
|
|
pixfmt.h \
|
|
random_seed.h \
|
|
rational.h \
|
|
samplefmt.h \
|
|
sha.h \
|
|
|
|
BUILT_HEADERS = avconfig.h
|
|
|
|
OBJS = adler32.o \
|
|
aes.o \
|
|
audioconvert.o \
|
|
avstring.o \
|
|
base64.o \
|
|
cpu.o \
|
|
crc.o \
|
|
des.o \
|
|
error.o \
|
|
eval.o \
|
|
fifo.o \
|
|
file.o \
|
|
imgutils.o \
|
|
intfloat_readwrite.o \
|
|
inverse.o \
|
|
lfg.o \
|
|
lls.o \
|
|
log.o \
|
|
lzo.o \
|
|
mathematics.o \
|
|
md5.o \
|
|
mem.o \
|
|
dict.o \
|
|
opt.o \
|
|
parseutils.o \
|
|
pixdesc.o \
|
|
random_seed.o \
|
|
rational.o \
|
|
rc4.o \
|
|
samplefmt.o \
|
|
sha.o \
|
|
tree.o \
|
|
utils.o \
|
|
|
|
OBJS-$(ARCH_ARM) += arm/cpu.o
|
|
OBJS-$(ARCH_PPC) += ppc/cpu.o
|
|
OBJS-$(ARCH_X86) += x86/cpu.o
|
|
|
|
TESTPROGS = adler32 aes base64 cpu crc des eval lls md5 pca sha tree
|
|
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
|
|
|
|
DIRS = arm bfin sh4 x86
|
|
|
|
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
|
|
|
|
include $(SRC_PATH)/subdir.mak
|
|
|
|
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
|