diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:42:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:51:34 +0200 |
| commit | 653d117c29123d353ce3bdd7de71e830a26733c1 (patch) | |
| tree | 996ad2bd13c774dc3265cbf0d8ae406372d57307 /libavutil | |
| parent | cb982739fa2b43afb7f1262c07804cad41f778de (diff) | |
| parent | fdc918632f5c16cf377a2170cd2f101933fb15ff (diff) | |
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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 31 | ||||
| -rw-r--r-- | libavutil/arm/Makefile | 2 |
2 files changed, 28 insertions, 5 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 83e6c07605..a4498313a9 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -42,6 +42,11 @@ HEADERS = adler32.h \ timecode.h \ timestamp.h \ +ARCH_HEADERS = bswap.h \ + intmath.h \ + intreadwrite.h \ + timer.h \ + BUILT_HEADERS = avconfig.h OBJS = adler32.o \ @@ -81,12 +86,30 @@ OBJS = adler32.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 = 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 -ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h - $(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2 diff --git a/libavutil/arm/Makefile b/libavutil/arm/Makefile index 246f73a8ac..e600383b9c 100644 --- a/libavutil/arm/Makefile +++ b/libavutil/arm/Makefile @@ -1 +1 @@ -OBJS += arm/cpu.o +OBJS += arm/cpu.o \ |