Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)
* qatar/master:
  x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

Conflicts:
libavcodec/x86/rnd_mmx.c

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

@@@ -52,15 -44,10 +52,13 @@@ MMX-OBJS-$(CONFIG_DSPUTIL)             
                                            x86/fpel_mmx.o                \
                                            x86/idct_mmx_xvid.o           \
                                            x86/idct_sse2_xvid.o          \
-                                           x86/rnd_mmx.o                 \
                                            x86/simple_idct.o
 +MMX-OBJS-$(CONFIG_DIRAC_DECODER)       += x86/dirac_dwt.o
  MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
-                                           x86/hpeldsp_mmx.o             \
-                                           x86/rnd_mmx.o
+                                           x86/hpeldsp_mmx.o
  
 +MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp.o
 +MMX-OBJS-$(CONFIG_SNOW_ENCODER)        += x86/snowdsp.o
  MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
  
  YASM-OBJS                              += x86/deinterlace.o             \
Simple merge