virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-12-03 02:59:19 +01:00
commit b452c8a722
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -1231,6 +1231,15 @@ ARCH_LIST='
x86_64 x86_64
' '
ARCH_EXT_LIST_ARM='
armv5te
armv6
armv6t2
armvfp
neon
vfpv3
'
ARCH_EXT_LIST_X86=' ARCH_EXT_LIST_X86='
amd3dnow amd3dnow
amd3dnowext amd3dnowext
@ -1247,15 +1256,10 @@ ARCH_EXT_LIST_X86='
' '
ARCH_EXT_LIST=" ARCH_EXT_LIST="
$ARCH_EXT_LIST_ARM
$ARCH_EXT_LIST_X86 $ARCH_EXT_LIST_X86
altivec altivec
armv5te
armv6
armv6t2
armvfp
neon
ppc4xx ppc4xx
vfpv3
vis vis
mipsfpu mipsfpu
mips32r2 mips32r2
@ -1840,6 +1844,7 @@ eac3_demuxer_select="ac3_parser"
f4v_muxer_select="mov_muxer" f4v_muxer_select="mov_muxer"
flac_demuxer_select="flac_parser" flac_demuxer_select="flac_parser"
ipod_muxer_select="mov_muxer" ipod_muxer_select="mov_muxer"
ismv_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut" libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut" libnut_muxer_deps="libnut"
matroska_audio_muxer_select="matroska_muxer" matroska_audio_muxer_select="matroska_muxer"

3
libavformat/Makefile
View File

@ -143,9 +143,6 @@ OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o
OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o
OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.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_ISS_DEMUXER) += iss.o
OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o
OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o

2
tests/fate/fft.mak
View File

@ -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): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_FIXED): REF = /dev/null $(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) fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED)