RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity
c39916bc2f
ffmpeg/libavutil/x86
History
Michael Niedermayer 77aedc77ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Provide the right alignment for external mmx asm
  x86: Replace checks for CPU extensions and flags by convenience macros
  configure: msvc: fix/simplify setting of flags for hostcc
  x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Conflicts:
	libavcodec/x86/fft_init.c
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/mpegaudiodec.c
	libavcodec/x86/proresdsp_init.c
	libavutil/x86/float_dsp_init.c
	libswscale/utils.c
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 13:27:42 +02:00
..
asm.h
bswap.h
cpu.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
float_dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
float_dsp.asm Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
intmath.h x86: remove FASTDIV inline asm 2012-08-22 14:29:10 +01:00
intreadwrite.h
Makefile
timer.h
w64xmmtest.h
x86inc.asm Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
x86util.asm Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00