diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:00:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:32:03 +0200 |
commit | 6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a (patch) | |
tree | 892dbfcfc54c4acdfe9619fdb597eb741c6abae6 /configure | |
parent | 840238b8706ea2ca740cf4b49bffd8ae196352f9 (diff) | |
parent | a1d0dcc7134f1401c682b5e13d4ab3864da21efb (diff) | |
download | ffmpeg-streaming-6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a.zip ffmpeg-streaming-6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: make executable again
LATM/AAC: Free previously initialized context on reinit.
configure: Do not unconditionally add -Wall to host CFLAGS.
configure: Set OS/2 objformat to a.out.
Add support for a.out object format to assembler macros.
fate: disable threading for encoding
fate: add comment field
fate: allow overriding default build and install dirs
mpegtsenc: Add an AVClass pointer to the private data
mpegaudio: clean up #includes
mpegaudio: move all header parsing to mpegaudiodecheader.[ch]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1700,7 +1700,7 @@ LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"' CC_O='-o $@' -host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall' +host_cflags='-D_ISOC99_SOURCE -O3 -g' host_libs='-lm' target_path='$(CURDIR)' @@ -2363,6 +2363,7 @@ check_cc -D_LARGEFILE_SOURCE <<EOF && add_cppflags -D_LARGEFILE_SOURCE EOF check_host_cflags -std=c99 +check_host_cflags -Wall case "$arch" in alpha|ia64|mips|parisc|sparc) @@ -2504,6 +2505,7 @@ case $target_os in os/2*) strip="lxlite -CS" ln_s="cp -f" + objformat="aout" add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' FFSERVERLDFLAGS="" |