1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
FFmpeg/libavcodec
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
..
2013-01-23 11:21:09 +00:00
2013-01-21 10:24:45 +00:00
2013-01-06 13:31:40 +01:00
2013-01-23 11:21:09 +00:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2013-01-14 22:59:05 +01:00
2013-01-21 10:24:45 +00:00
2013-01-21 10:24:45 +00:00
2012-12-24 04:35:12 +01:00
2013-01-23 11:21:09 +00:00
2013-01-23 11:21:09 +00:00
2013-01-14 22:59:05 +01:00
2012-12-31 00:41:35 +01:00
2013-01-14 16:37:12 +01:00
2013-01-06 16:30:02 +01:00
2013-01-10 04:57:50 +01:00
2013-01-12 14:06:30 +01:00
2013-01-12 14:06:30 +01:00
2013-01-22 22:29:23 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-06 16:30:02 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 13:12:49 +02:00
2013-01-14 05:05:39 +01:00
2013-01-23 05:25:04 +01:00
2013-01-21 10:24:45 +00:00
2013-01-16 20:56:14 +00:00
2013-01-06 13:31:40 +01:00