1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavutil/Makefile
Michael Niedermayer 653d117c29 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libschroedinger: Switch to function names more in line with Libav style.
  Move code shared between libdirac and libschroedinger to libschroedinger.
  lavfi: uninline avfilter_copy_buffer_ref_props().
  lavf: add missing '*' in a doxy.
  h264: Remove a commented-out function pointer typedef.
  txd: Remove write-only variable in txd_decode_frame().
  mmvideo.c: Remove unused variable in mm_decode_pal().
  build: cosmetics: Add missing end-of-line backslashes to item lists.
  build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
  libschroedinger: Move a function to avoid a forward declaration.
  pthread: warn on high thread counts
  vf_yadif: fix missing error handling for avfilter_poll_frame()
  avprobe: allow showing only one container/stream property.
  lavfi: support audio in avfilter_copy_frame_props().
  lavfi: avfilter_merge_formats: handle case where inputs are same
  lavc: add sample rate and channel layout to AVFrame.
  zerocodec: check if the previous frame is missing
  doc: clarify check for NULL pointer style

Conflicts:
	doc/APIchanges
	doc/developer.texi
	ffprobe.c
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/libdirac_libschro.c
	libavcodec/libdirac_libschro.h
	libavcodec/mmvideo.c
	libavcodec/txd.c
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/version.h
	libavformat/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:51:34 +02:00

116 lines
7.4 KiB
Makefile

include $(SUBDIR)../config.mak
NAME = avutil
HEADERS = adler32.h \
aes.h \
attributes.h \
audio_fifo.h \
audioconvert.h \
avassert.h \
avstring.h \
avutil.h \
base64.h \
bprint.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 \
ARCH_HEADERS = bswap.h \
intmath.h \
intreadwrite.h \
timer.h \
BUILT_HEADERS = avconfig.h
OBJS = adler32.o \
aes.o \
audio_fifo.o \
audioconvert.o \
avstring.o \
base64.o \
bprint.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 \
TESTPROGS = adler32 \
aes \
avstring \
base64 \
bprint \
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
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2