Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 13:13:54 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 13:13:54 +0000 (14:13 +0100)
commit24604ebaf85b5436d10da811f455dd710b353aca
tree46988a19c56e7914715dc3852e6588fb887c6c77
parent6e6e1708984e45881b9a5d4e26c3e7de852c54d5
parent5959bfaca396ecaf63a8123055f499688b79cae3
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>
13 files changed:
libavcodec/aacdec.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/twinvq.c
libavcodec/wma.c
libavcodec/wma.h
libavcodec/wmadec.c
libavutil/float_dsp.c
libavutil/float_dsp.h