diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 12:30:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 12:30:25 +0200 |
| commit | 741f5b021a0494676de0dab543f8a9591ec2e01e (patch) | |
| tree | 51b8243f64192e37c61bf03d18a25f40fd4c0d6d /configure | |
| parent | 047dcfabc7e8932490836be94ef3b2ecc8289ab0 (diff) | |
| parent | 29abb04e73b0580ebe38703cadb988d26df6a76a (diff) | |
| download | ffmpeg-741f5b021a0494676de0dab543f8a9591ec2e01e.tar.gz | |
Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'
* commit '29abb04e73b0580ebe38703cadb988d26df6a76a':
libspeexdec: If the channel count is not valid, decode as stereo.
libspeexdec: improve setting of Speex mode and sample rate
libspeex: Add a private option for enabling VAD
xtea: Test inplace decryption
xtea: Fix CBC decryption when src==dst
xtea: Factorize testing into a separate function
configure: Refactor HAVE_ options available on the command line
avconv/avprobe: Add missing 'void' to exit_program() definition
Allow use of strncpy()
blowfish: Add more tests
blowfish: Fix CBC decryption with dst==src
blowfish: Factorize testing into a separate function
Conflicts:
configure
libavcodec/libspeexdec.c
libavutil/xtea.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -1243,6 +1243,12 @@ ARCH_EXT_LIST=" mipsdspr2 " +HAVE_LIST_CMDLINE=' + inline_asm + symver + yasm +' + HAVE_LIST_PUB=' bigendian fast_unaligned @@ -1253,6 +1259,7 @@ HAVE_LIST=" $ARCH_EXT_LIST $(add_suffix _external $ARCH_EXT_LIST) $(add_suffix _inline $ARCH_EXT_LIST) + $HAVE_LIST_CMDLINE $HAVE_LIST_PUB $THREADS_LIST aligned_malloc @@ -1305,7 +1312,6 @@ HAVE_LIST=" gnu_as ibm_asm inet_aton - inline_asm io_h isatty isinf @@ -1369,7 +1375,6 @@ HAVE_LIST=" struct_sockaddr_sa_len struct_sockaddr_storage struct_v4l2_frmivalenum_discrete - symver symver_asm_label symver_gnu_asm sysconf @@ -1395,7 +1400,6 @@ HAVE_LIST=" xform_asm xgetbv xmm_clobbers - yasm " # options emitted with CONFIG_ prefix but not available on command line @@ -1427,18 +1431,16 @@ CONFIG_EXTRA=" CMDLINE_SELECT=" $ARCH_EXT_LIST $CONFIG_LIST + $HAVE_LIST_CMDLINE $THREADS_LIST asm coverage cross_compile debug extra_warnings - inline_asm logging optimizations stripping - symver - yasm " PATHS_LIST=' |