Michael Niedermayer 99de3df3d3 Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' ... * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-05 14:09:09 +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	Remove redundant masks in STORE_BGR24_MMX.	2012-09-02 21:56:50 +02:00
colorspace-test.c	Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'	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
Makefile	Merge remote-tracking branch 'qatar/master'	2012-07-04 21:03:28 +02:00
options.c	Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'	2012-09-05 14:09:09 +02:00
output.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
rgb2rgb_template.c	Merge remote-tracking branch 'qatar/master'	2012-02-23 04:31:55 +01: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
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
swscale-test.c
swscale.c	Merge remote-tracking branch 'qatar/master'	2012-08-31 13:34:32 +02:00
swscale.h	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
utils.c	Merge remote-tracking branch 'qatar/master'	2012-08-31 13:34:32 +02:00
version.h	Merge remote-tracking branch 'qatar/master'	2012-08-04 23:51:43 +02:00
yuv2rgb.c	Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'	2012-08-29 18:04:34 +02:00