Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 9 insertions, 0 deletions

diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h
index 3ee4ca2..ff83bed 100644
--- a/libavutil/float_dsp.h
+++ b/libavutil/float_dsp.h
@@ -137,6 +137,15 @@ typedef struct AVFloatDSPContext {
      */
     void (*vector_fmul_reverse)(float *dst, const float *src0,
                                 const float *src1, int len);
+
+    /**
+     * Calculate the sum and difference of two vectors of floats.
+     *
+     * @param v1  first input vector, sum output, 16-byte aligned
+     * @param v2  second input vector, difference output, 16-byte aligned
+     * @param len length of vectors, multiple of 4
+     */
+    void (*butterflies_float)(float *restrict v1, float *restrict v2, int len);
 } AVFloatDSPContext;
 
 /**