diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
| commit | ef9fe5bedd1993700818a0ba1c195cd6f6668afe (patch) | |
| tree | 3c70bf61e4bae16375575e3e6e8dac55fc1ba148 /configure | |
| parent | 238e904df3988ea0253ba08c8b2883e4740565b6 (diff) | |
| parent | a75b9a1804769169456306f570b6716d977ebdc5 (diff) | |
| download | ffmpeg-ef9fe5bedd1993700818a0ba1c195cd6f6668afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
Restructure av_log_missing_feature message
rtp: Support packetization/depacketization of opus
file: Set the return value type for lseek to int64_t.
ppc: fix Altivec build with old compilers
build: add LTO support for PGI compiler
build: add -Mdse to PGI optimisation flags
rtpenc_vp8: Update the packetizer to the latest spec version
rtpdec_vp8: Make the depacketizer implement the latest spec draft
doc: allow building with old texi2html versions
avutil: skip old_pix_fmts.h since it is just a list
Conflicts:
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/utils.c
libavformat/file.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2429,6 +2429,7 @@ msvc_flags(){ pgi_flags(){ for flag; do case $flag in + -flto) echo -Mipa=fast,libopt,libinline,vestigial ;; -fomit-frame-pointer) echo -Mnoframe ;; -g) echo -gopt ;; *) echo $flag ;; @@ -2607,7 +2608,7 @@ probe_cc(){ elif $_cc -V 2>&1 | grep -q Portland; then _type=pgi _ident="PGI $($_cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')" - opt_common='-alias=ansi -Mlre -Mpre' + opt_common='-alias=ansi -Mdse -Mlre -Mpre' _cflags_speed="-O3 -Mautoinline -Munroll=c:4 $opt_common" _cflags_size="-O2 -Munroll=c:1 $opt_common" _cflags_noopt="-O1" @@ -3109,7 +3110,6 @@ case $target_os in objformat="win32" ranlib=: enable dos_paths - check_cflags -fno-common add_cppflags -U__STRICT_ANSI__ ;; cygwin*) @@ -3125,7 +3125,6 @@ case $target_os in SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' objformat="win32" enable dos_paths - check_cflags -fno-common add_cppflags -U__STRICT_ANSI__ ;; *-dos|freedos|opendos) |