Michael Niedermayer
8102f27b5b
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@gmx.at>
2013-01-23 14:31:55 +01:00
..
2012-11-28 13:32:17 +01:00
2013-01-19 13:20:25 +01:00
2013-01-19 13:20:25 +01:00
2013-01-23 14:31:55 +01:00
2013-01-23 14:31:55 +01:00
2013-01-18 22:02:13 +01:00
2013-01-19 13:11:41 +01:00
2013-01-19 13:11:41 +01:00