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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -2855,12 +2855,12 @@ elif enabled x86; then elif enabled sparc; then case $cpu in - niagara) + cypress|f93[04]|tsc701|sparcl*|supersparc|hypersparc|niagara|v[789]) cpuflags="-mcpu=$cpu" disable vis ;; - sparc64) - cpuflags="-mcpu=v9" + ultrasparc*|niagara[234]) + cpuflags="-mcpu=$cpu" ;; esac @@ -3446,9 +3446,7 @@ EOF elif enabled sparc; then - enabled vis && - check_inline_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc && - add_cflags -mcpu=ultrasparc -mtune=ultrasparc + enabled vis && check_inline_asm vis '"pdist %f0, %f0, %f0"' elif enabled x86; then |
