RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libswscale/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
..
Makefile
…
input.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
output.asm Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
rgb2rgb_template.c Remove redundant masks in STORE_BGR24_MMX. 2012-09-02 21:56:50 +02:00
scale.asm
…
swscale.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
swscale_template.c
…
w64xmmtest.c
…
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
yuv2rgb_template.c
…