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>

diff --cc configure
index 71d0ad8,12052c0..9c0c08f
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1075,14 -959,11 +1074,13 @@@ CONFIG_LIST=
      avresample
      avisynth
      bzlib
 +    crystalhd
      dct
 -    doc
      dwt
      dxva2
-     fastdiv
 +    fast_unaligned
      fft
 +    fontconfig
      frei0r
      gnutls
      gpl

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/x86/Makefile
index 21eeb05,5128583..73a6a60
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -25,9 -22,9 +24,10 @@@ MMX-OBJS-$(CONFIG_H264DSP)             
  MMX-OBJS-$(CONFIG_H264PRED)            += x86/h264_intrapred_init.o
  MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
  MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec_mmx.o
+ MMX-OBJS-$(CONFIG_MPEGVIDEO)           += x86/mpegvideo_mmx.o
  MMX-OBJS-$(CONFIG_PNG_DECODER)         += x86/pngdsp_init.o
  MMX-OBJS-$(CONFIG_PRORES_DECODER)      += x86/proresdsp_init.o
 +MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o
  MMX-OBJS-$(CONFIG_RV30_DECODER)        += x86/rv34dsp_init.o
  MMX-OBJS-$(CONFIG_RV40_DECODER)        += x86/rv34dsp_init.o            \
                                            x86/rv40dsp_init.o

diff --cc libavutil/intmath.h
Simple merge