[FFmpeg-cvslog] Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 14:31:55 2013 +0100| [8102f27b5b3dff54f8099019c2df4701ac5e5d4f] | committer: Michael Niedermayer

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
  arm: Add some missing header #includes
  floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

Conflicts:
	libavcodec/acelp_pitch_delay.c
	libavcodec/amrnbdec.c
	libavcodec/amrwbdec.c
	libavcodec/ra288.c
	libavcodec/x86/dsputil_mmx.c
	libavutil/x86/float_dsp.asm

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

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