1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavutil/x86
Michael Niedermayer b4d4e51027 Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-27 14:10:05 +01:00
..
asm.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
bswap.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02: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
float_dsp_init.c Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 2012-11-27 14:10:05 +01:00
float_dsp.asm Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 2012-11-27 14:10:05 +01:00
intreadwrite.h
Makefile x86: Add YASM implementations of cpuid and xgetbv from x264 2012-10-04 19:29:14 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-07-08 22:33:32 +02:00
w64xmmtest.h Add more missing includes after removing the implicit common.h 2012-08-16 10:49:54 +03:00
x86inc.asm Merge commit '802713c4e7b41bc2deed754d78649945c3442063' 2012-11-12 10:57:06 +01:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2012-11-19 14:24:20 +01:00