diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:59:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:59:19 +0100 |
| commit | b452c8a722b7d145f0a4396d26d609aad3feeccd (patch) | |
| tree | 8dfa4610689e4c7442abca36088d0d194d749d9d | |
| parent | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (diff) | |
| parent | eebc40e17784ced5ce297fb3e0a6caa7b9ee2433 (diff) | |
| download | ffmpeg-b452c8a722b7d145f0a4396d26d609aad3feeccd.tar.gz | |
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>
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | libavformat/Makefile | 3 | ||||
| -rw-r--r-- | tests/fate/fft.mak | 2 |
3 files changed, 12 insertions, 10 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" diff --git a/libavformat/Makefile b/libavformat/Makefile index 19378b37cf..daa406f682 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -143,9 +143,6 @@ OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o -OBJS-$(CONFIG_ISMV_MUXER) += movenc.o isom.o avc.o \ - movenchint.o rtpenc_chain.o \ - mov_chan.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak index d3889cc877..20d563828f 100644 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@ -38,5 +38,5 @@ $(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF) $(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) $(FATE_FFT_FIXED): REF = /dev/null -FATE-$(CONFIG_FFT) += $(FATE_FFT) $(FATE_FFT_FIXED) +FATE-$(call ALLYES, AVCODEC FFT) += $(FATE_FFT) $(FATE_FFT_FIXED) fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED) |