diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-23 04:49:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-23 04:49:04 +0200 |
| commit | 4b87a088bf5acad2a11e9f9c1dcec8f29bab3ec9 (patch) | |
| tree | a42f2f7b366968658fcb1797faa5d46351416d09 /configure | |
| parent | 1af1b527727ccdfcfec8c02fa4e1ff291e9dd932 (diff) | |
| parent | 9cd7b8549b71bcfced2062596fd9eecba092aeb1 (diff) | |
| download | ffmpeg-4b87a088bf5acad2a11e9f9c1dcec8f29bab3ec9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add --optflags option
build: move documentation rules to doc/Makefile
build: move test rules to tests/Makefile
ac3enc: remove unneeded local variable in asym_quant()
ac3enc: remove a branch in asym_quant() by doing 2 shifts
ac3enc: avoid masking output in asym_quant() by using signed values for quantized mantissas.
H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
H.264: fix 4:4:4 + deblocking + MBAFF
H.264: fix 4:4:4 cropping warning
H.264: reference the correct SPS in decode_scaling_matrices
H.264: fix bug in lossless 4:4:4 decoding
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -238,6 +238,7 @@ Advanced options (experts only): --malloc-prefix=PFX prefix malloc and related names with PFX --enable-sram allow use of on-chip SRAM --disable-symver disable symbol versioning + --optflags override optimization-related compiler flags Developer options (useful when working on FFmpeg itself): --disable-debug disable debugging symbols @@ -1187,6 +1188,7 @@ CMDLINE_SET=" logfile malloc_prefix nm + optflags pkg_config samples strip @@ -3062,7 +3064,9 @@ void ff_foo(void) {} EOF fi -if enabled small; then +if [ -n "$optflags" ]; then + add_cflags $optflags +elif enabled small; then add_cflags $size_cflags elif enabled optimizations; then add_cflags $speed_cflags @@ -3288,6 +3292,7 @@ if enabled source_path_used; then Makefile common.mak subdir.mak + doc/Makefile doc/texi2pod.pl libavcodec/Makefile libavcodec/${arch}/Makefile @@ -3298,6 +3303,7 @@ if enabled source_path_used; then libavutil/Makefile libpostproc/Makefile libswscale/Makefile + tests/Makefile " map 'mkdir -p $v' $DIRS; map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES |