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)
commitb452c8a722b7d145f0a4396d26d609aad3feeccd
tree8dfa4610689e4c7442abca36088d0d194d749d9d
parent7711f19eda40a7fd1c8a327f1700ffdd115e1667
parenteebc40e17784ced5ce297fb3e0a6caa7b9ee2433
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>
configure
libavformat/Makefile