Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 12:54:34 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 12:54:34 +0000 (13:54 +0100)
commitb1b870fbd7185bffbe27c5918001b40a8ff8b920
treebcbe435fd95a2b06c8526617a2959fe0f6b8c637
parent205b2d2a9822e163cb24a2531d4b50e82e64eae4
parent55aa03b9f8f11ebb7535424cc0e5635558590f49
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'

* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
  floatdsp: move vector_fmul_add from dsputil to avfloatdsp.

Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
libavcodec/aacsbr.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/float_altivec.c
libavcodec/wmadec.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavutil/float_dsp.c
libavutil/float_dsp.h
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/float_dsp_altivec.h
libavutil/ppc/float_dsp_init.c
libavutil/x86/float_dsp.asm
libavutil/x86/float_dsp_init.c