Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Aug 2012 12:37:03 +0000 (14:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Aug 2012 12:37:03 +0000 (14:37 +0200)
commit36999606902ce5c53636552ec46df5a38fd3bd6b
treec081b062a579c147efab57f8eaab5f283be085df
parenta7219529d1b872f6a8e36788de44aa3ab0a7b05e
parent6fa488678f39fe45abe898fd7ef457849d0a8d99
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: x86: Only compile mpegvideo optimizations when necessary
  configure: Drop fastdiv option
  build: Make the E-AC-3 encoder select the AC-3 encoder
  fate: flac: Only run tests requiring samples when samples are available

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavutil/intmath.h