diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-17 17:06:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-17 17:06:52 +0200 |
commit | fa3fde168b8c3d2d7c008a98457832575dbf9fe0 (patch) | |
tree | 44ac6dc9bc226deb2310c4ba901c28e202c777fa /configure | |
parent | 517a2bbcf131df3e61ff4494d7f695b4570bc5fc (diff) | |
parent | 4aa3d7b3f2b71296d73276d62be4e806b34d2d01 (diff) | |
download | ffmpeg-fa3fde168b8c3d2d7c008a98457832575dbf9fe0.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpxenc: use the default bitrate if not set
utvideo: Rename utvideo.c to utvideodec.c
doc: Fix syntax errors in sample Emacs config
mjpegdec: more meaningful return values
configure: clean up Altivec detection
getopt: Remove an unnecessary define
rtmp: Use int instead of ssize_t
getopt: Add missing includes
rtmp: Add support for receiving incoming streams
Add missing includes for code relying on external libraries
Conflicts:
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/mjpegdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -3194,17 +3194,14 @@ elif enabled ppc; then check_cc <<EOF || disable altivec $inc_altivec_h int main(void) { - vector signed int v1, v2, v3; - v1 = vec_add(v2,v3); + vector signed int v1 = (vector signed int) { 0 }; + vector signed int v2 = (vector signed int) { 1 }; + v1 = vec_add(v1, v2); return 0; } EOF - # check if our compiler supports braces for vector declarations - check_cc <<EOF || die "You need a compiler that supports {} in AltiVec vector declarations." -$inc_altivec_h -int main (void) { (vector int) {1}; return 0; } -EOF + enabled altivec || warn "Altivec disabled, possibly missing --cpu flag" fi elif enabled sparc; then |