1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2012-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-08-16 22:04:46 +02:00
2012-08-15 22:32:06 +03:00
2012-05-15 18:08:32 +02:00
2012-08-09 01:44:15 +02:00
2012-08-22 14:29:10 +01:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-09-07 09:59:12 +02:00
2012-07-06 17:08:22 +02:00