151ecc2aec
* qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
93 lines
5.4 KiB
Makefile
93 lines
5.4 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.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 avstring base64 cpu crc des eval file fifo lfg lls \
|
|
md5 opt pca parseutils rational sha tree
|
|
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
|
|
|
|
TOOLS = ffeval
|
|
|
|
DIRS = arm bfin sh4 x86
|
|
|
|
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
|
|
|
|
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
|