diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 05:59:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 05:59:19 +0400 |
commit | b452c8a722b7d145f0a4396d26d609aad3feeccd (patch) | |
tree | 8dfa4610689e4c7442abca36088d0d194d749d9d /configure | |
parent | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (diff) | |
parent | eebc40e17784ced5ce297fb3e0a6caa7b9ee2433 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fft: Fix libavcodec dependency
build: Make the ISMV muxer select the MOV muxer
configure: move arm arch extensions to a separate variable
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -1231,6 +1231,15 @@ ARCH_LIST=' x86_64 ' +ARCH_EXT_LIST_ARM=' + armv5te + armv6 + armv6t2 + armvfp + neon + vfpv3 +' + ARCH_EXT_LIST_X86=' amd3dnow amd3dnowext @@ -1247,15 +1256,10 @@ ARCH_EXT_LIST_X86=' ' ARCH_EXT_LIST=" + $ARCH_EXT_LIST_ARM $ARCH_EXT_LIST_X86 altivec - armv5te - armv6 - armv6t2 - armvfp - neon ppc4xx - vfpv3 vis mipsfpu mips32r2 @@ -1840,6 +1844,7 @@ eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" flac_demuxer_select="flac_parser" ipod_muxer_select="mov_muxer" +ismv_muxer_select="mov_muxer" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" matroska_audio_muxer_select="matroska_muxer" |