Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 01:59:19 +0000 (02:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 01:59:19 +0000 (02:59 +0100)
* 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>
1  2 
configure
libavformat/Makefile

diff --cc configure
+++ b/configure
@@@ -1247,20 -1121,11 +1256,15 @@@ 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
 +    mipsdspr1
 +    mipsdspr2
  "
  
  HAVE_LIST_CMDLINE='
@@@ -1834,14 -1643,10 +1838,15 @@@ ac3_demuxer_select="ac3_parser
  asf_stream_muxer_select="asf_muxer"
  avisynth_demuxer_deps="avisynth"
  dirac_demuxer_select="dirac_parser"
 +dts_demuxer_select="dca_parser"
 +dtshd_demuxer_select="dca_parser"
  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"
  matroska_demuxer_suggest="bzlib lzo zlib"
  mov_demuxer_suggest="zlib"
Simple merge