[FFmpeg-cvslog] Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 14:13:54 2013 +0100| [24604ebaf85b5436d10da811f455dd710b353aca] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24604ebaf85b5436d10da811f455dd710b353aca
---