FFmpeg/libavutil/Makefile
Michael Niedermayer b25a265a5c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pcm-mpeg: convert to bytestream2 API
  Revert "h264: clear trailing bits in partially parsed NAL units"
  remove iwmmxt optimizations
  mimic: do not continue if swap_buf_size is 0
  mimic: convert to bytestream2 API
  frwu: use MKTAG to check marker instead of AV_RL32
  txd: port to bytestream2 API
  c93: convert to bytestream2 API
  iff: make .long_name more descriptive
  FATE: add test for cdxl demuxer
  rtsp: Fix a typo

Conflicts:
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/dsputil_iwmmxt_rnd_template.c
	libavcodec/arm/mpegvideo_iwmmxt.c
	libavcodec/c93.c
	libavcodec/txd.c
	libavutil/arm/cpu.c
	tests/fate/demux.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-13 01:56:33 +01:00

95 lines
5.6 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 \
timecode.h \
timestamp.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 \
timecode.o \
tree.o \
utils.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 random_seed rational sha tree
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
TOOLS = ffeval
DIRS = arm avr32 bfin mips ppc sh4 tomi x86
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2