Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 18:12:31 +0000 (20:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 18:12:31 +0000 (20:12 +0200)
* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
  x86: build: Only compile FDCT code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/Makefile

@@@ -8,11 -8,8 +8,10 @@@ OBJS-$(CONFIG_BSWAPDSP)                
  OBJS-$(CONFIG_DCT)                     += x86/dct_init.o
  OBJS-$(CONFIG_DSPUTIL)                 += x86/dsputil_init.o
  OBJS-$(CONFIG_ENCODERS)                += x86/dsputilenc_mmx.o          \
-                                           x86/fdct.o                    \
                                            x86/motion_est.o
  OBJS-$(CONFIG_FFT)                     += x86/fft_init.o
 +OBJS-$(CONFIG_FLAC_DECODER)            += x86/flacdsp_init.o
 +OBJS-$(CONFIG_FLAC_ENCODER)            += x86/flacdsp_init.o
  OBJS-$(CONFIG_H263DSP)                 += x86/h263dsp_init.o
  OBJS-$(CONFIG_H264CHROMA)              += x86/h264chroma_init.o
  OBJS-$(CONFIG_H264DSP)                 += x86/h264dsp_init.o
@@@ -56,10 -48,12 +55,11 @@@ OBJS-$(CONFIG_VP6_DECODER)             
  OBJS-$(CONFIG_VP7_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  
 -MMX-OBJS-$(CONFIG_AUDIODSP)            += x86/audiodsp_mmx.o
  MMX-OBJS-$(CONFIG_DSPUTIL)             += x86/dsputil_mmx.o
 -MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
 -                                          x86/hpeldsp_mmx.o
 +MMX-OBJS-$(CONFIG_DIRAC_DECODER)       += x86/dirac_dwt.o
+ MMX-OBJS-$(CONFIG_ENCODERS)            += x86/fdct.o
  MMX-OBJS-$(CONFIG_IDCTDSP)             += x86/idctdsp_mmx.o             \
                                            x86/idct_mmx_xvid.o           \
                                            x86/idct_sse2_xvid.o          \