ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-09-14	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place trasher: Include all the necessary headers x86: Remove some leftover declarations for non-existent functions ARM: libavresample: NEON optimised generic fltp to s16 conversion ARM: libavresample: NEON optimised stereo fltp to s16 conversion ARM: libavresample: NEON optimised flat float to s16 conversion Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	ARM: libavresample: NEON optimised generic fltp to s16 conversion	Mans Rullgard	2012-09-13	2	-0/+238
\| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
*	ARM: libavresample: NEON optimised stereo fltp to s16 conversion	Mans Rullgard	2012-09-13	2	-0/+69
\| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
*	ARM: libavresample: NEON optimised flat float to s16 conversion	Mans Rullgard	2012-09-13	3	-0/+107
	Signed-off-by: Mans Rullgard <mans@mansr.com>