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 /Makefile | |
| parent | 7fe6f6e2b10fe278fecea850fda1d8e321330c15 (diff) | |
| parent | 6aa93689abe8c095cec9fa828c2dee3131008995 (diff) | |
| download | ffmpeg-streaming-9aa630a520eb985dc6eefa5bc0f96e8269265ecb.zip ffmpeg-streaming-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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -68,7 +68,7 @@ config.h: .config @-tput sgr0 2>/dev/null SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ - ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ + HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ ALTIVEC-OBJS VIS-OBJS \ MMX-OBJS YASM-OBJS \ |
