Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
libavcodec/x86/Makefile

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

Simple merge
@@@ -325,8 -320,6 +325,8 @@@ void ff_dsputil_init_bfin(DSPContext* c
  void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
  void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
  void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
+ void ff_dsputil_init_x86(DSPContext* c, AVCodecContext *avctx);
  
 +void ff_dsputil_init_dwt(DSPContext *c);
 +
  #endif /* AVCODEC_DSPUTIL_H */
@@@ -31,21 -32,15 +34,17 @@@ OBJS-$(CONFIG_VORBIS_DECODER)          
  OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
  OBJS-$(CONFIG_VP6_DECODER)             += x86/vp6dsp_init.o
  OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
  
- MMX-OBJS-$(CONFIG_DSPUTIL)             += x86/dsputil_init.o            \
-                                           x86/dsputil_mmx.o             \
+ MMX-OBJS-$(CONFIG_DSPUTIL)             += x86/dsputil_mmx.o             \
                                            x86/fdct.o                    \
                                            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_ENCODERS)            += x86/dsputilenc_mmx.o          \
-                                           x86/motion_est.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
Simple merge