diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
commit | 24604ebaf85b5436d10da811f455dd710b353aca (patch) | |
tree | 46988a19c56e7914715dc3852e6588fb887c6c77 /libavcodec/dsputil.c | |
parent | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff) | |
parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
download | ffmpeg-streaming-24604ebaf85b5436d10da811f455dd710b353aca.zip ffmpeg-streaming-24604ebaf85b5436d10da811f455dd710b353aca.tar.gz |
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>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r-- | libavcodec/dsputil.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 01232bf..49e56cc 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2483,17 +2483,6 @@ WRAPPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c) WRAPPER8_16_SQ(rd8x8_c, rd16_c) WRAPPER8_16_SQ(bit8x8_c, bit16_c) -static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, - int len) -{ - int i; - for (i = 0; i < len; i++) { - float t = v1[i] - v2[i]; - v1[i] += v2[i]; - v2[i] = t; - } -} - float ff_scalarproduct_float_c(const float *v1, const float *v2, int len) { float p = 0.0; @@ -2887,7 +2876,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->apply_window_int16 = apply_window_int16_c; c->vector_clip_int32 = vector_clip_int32_c; c->scalarproduct_float = ff_scalarproduct_float_c; - c->butterflies_float = butterflies_float_c; c->shrink[0]= av_image_copy_plane; c->shrink[1]= ff_shrink22; |