diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 14:55:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 15:20:48 +0200 |
| commit | 9aa630a520eb985dc6eefa5bc0f96e8269265ecb (patch) | |
| tree | 7b573b974d5f4622113e0798732aa4b67f49bae2 /libavutil/Makefile | |
| parent | 7fe6f6e2b10fe278fecea850fda1d8e321330c15 (diff) | |
| parent | 6aa93689abe8c095cec9fa828c2dee3131008995 (diff) | |
| download | ffmpeg-9aa630a520eb985dc6eefa5bc0f96e8269265ecb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: sanitise sparc vis check
configure: recognise more sparc variants as --cpu argument
build: Include HEADERS-yes in the HEADERS variable
pcm: change references to raw to pcm
ffv1: set the range coder state in decode_slice_header
pcmdec: change default of channels parameter to 1
Conflicts:
libavformat/pcmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 2cf0174697..20dfba407a 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -2,8 +2,6 @@ include $(SUBDIR)../config.mak NAME = avutil -HEADERS-$(CONFIG_LZO) += lzo.h - HEADERS = adler32.h \ aes.h \ attributes.h \ @@ -47,7 +45,8 @@ HEADERS = adler32.h \ timestamp.h \ version.h \ xtea.h \ - $(HEADERS-yes) \ + +HEADERS-$(CONFIG_LZO) += lzo.h ARCH_HEADERS = bswap.h \ intmath.h \ |