RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity
55910e1894
ffmpeg/libavutil/x86
History
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
..
asm.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
bswap.h
cpu.c Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 2012-11-28 13:32:17 +01:00
cpu.h Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02:00
cpuid.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
emms.asm Merge remote-tracking branch 'qatar/master' 2013-01-19 13:20:25 +01:00
emms.h Merge remote-tracking branch 'qatar/master' 2013-01-19 13:20:25 +01:00
float_dsp_init.c Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9' 2013-01-23 14:31:55 +01:00
float_dsp.asm Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9' 2013-01-23 14:31:55 +01:00
intreadwrite.h
Makefile x86: Add a Yasm-based emms() replacement 2013-01-18 22:02:13 +01:00
timer.h
w64xmmtest.h Add more missing includes after removing the implicit common.h 2012-08-16 10:49:54 +03:00
x86inc.asm Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d' 2013-01-19 13:11:41 +01:00
x86util.asm Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d' 2013-01-19 13:11:41 +01:00