Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-04-24 11:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
colorspace-test.c Merge commit 'd488c3bcba' 2012-08-29 18:04:34 +02:00
input.c swscale/input: silence warnings about incompatible pointer types 2012-07-19 15:49:21 +00:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
options.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
output.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rgb2rgb.h swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
swscale_internal.h swscale: fix usePal() 2012-08-30 13:37:03 +02:00
swscale_unscaled.c Optimized unscaled yuvp9/yuvp10 -> yuvp16 conversion. 2012-08-12 23:23:19 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
yuv2rgb.c Merge commit 'd488c3bcba' 2012-08-29 18:04:34 +02:00