diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 13:15:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 13:15:58 +0200 |
| commit | aa604e8e33ae06f3a106e44fff798fdd70d77230 (patch) | |
| tree | de1f5670244e74d90e97b8dc69f054768c363959 /libavutil/Makefile | |
| parent | d312ffdd79bd22b5a051790c993eda6b1366cdfc (diff) | |
| parent | 2a91ada8282f18d2807abee5188225bba1b19bda (diff) | |
| download | ffmpeg-aa604e8e33ae06f3a106e44fff798fdd70d77230.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Make LZO decoder code configure-time selectable
avutil: Move memcpy_backptr() to mem.c
configure: detect parisc64 automatically
configure: detect ppc64 automatically
configure: detect mips64 automatically
configure: generalise 64-bit test
smoothstreamingenc: Don't assume streams start from timestamp 0
Conflicts:
configure
libavutil/Makefile
libavutil/lzo.c
libavutil/lzo.h
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 3a6f7313ed..88a978f96f 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -27,7 +27,6 @@ HEADERS = adler32.h \ intreadwrite.h \ lfg.h \ log.h \ - lzo.h \ mathematics.h \ md5.h \ mem.h \ @@ -47,6 +46,8 @@ HEADERS = adler32.h \ version.h \ xtea.h \ +HEADERS-$(CONFIG_LZO) += lzo.h + ARCH_HEADERS = bswap.h \ intmath.h \ intreadwrite.h \ @@ -77,7 +78,6 @@ OBJS = adler32.o \ log.o \ log2.o \ log2_tab.o \ - lzo.o \ mathematics.o \ md5.o \ mem.o \ @@ -97,6 +97,7 @@ OBJS = adler32.o \ xga_font_data.o \ xtea.o \ +OBJS-$(CONFIG_LZO) += lzo.o OBJS += $(COMPAT_OBJS:%=../compat/%) |