Michael Niedermayer a1b5c9634e Merge remote-tracking branch 'qatar/master' ... * qatar/master: x86: mmx2 ---> mmxext in asm constructs Conflicts: libavcodec/x86/h264_chromamc_10bit.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-11-14 12:34:30 +01:00
..
bfin	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
ppc	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
sparc	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
x86	Merge remote-tracking branch 'qatar/master'	2012-11-14 12:34:30 +01:00
Makefile	…
colorspace-test.c	…
input.c	Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'	2012-11-01 13:11:51 +01:00
libswscale.v	swscale: Do not make ff_ symbols globally visible.	2012-10-10 02:08:01 +02:00
options.c	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
output.c	Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'	2012-10-12 15:57:28 +02:00
rgb2rgb.c	Merge commit '652f5185945c8405fc57aed353286858df8d066f'	2012-10-31 14:02:35 +01:00
rgb2rgb.h	…
rgb2rgb_template.c	Merge commit '652f5185945c8405fc57aed353286858df8d066f'	2012-10-31 14:02:35 +01:00
swscale-test.c	sws-test: parse command line args before initing contexts	2012-10-17 11:56:36 +02:00
swscale.c	swscale.c:remove fill_plane9or10() use fillPlane16()	2012-10-30 18:51:21 +01:00
swscale.h	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
swscale_internal.h	Merge commit 'a65bdceb060628881578afb29df4eb222421381f'	2012-10-31 14:08:49 +01:00
swscale_unscaled.c	sws: move fillPlane16() to header so it can be used from more than 1 place	2012-10-30 18:51:21 +01:00
utils.c	Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'	2012-11-01 13:11:51 +01:00
version.h	sws: bump micro for range bugfix	2012-11-01 00:32:15 +01:00
yuv2rgb.c	yuv2rgb: fix integer overflow in fill_gv_table()	2012-10-24 01:24:26 +02:00