mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-26 16:20:47 +00:00
58257ea29e
* qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
91 lines
5.3 KiB
Makefile
91 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 avstring base64 cpu crc des eval file lfg lls \
|
|
md5 opt pca parseutils rational 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
|