Michael Niedermayer ae237a117a Merge remote-tracking branch 'qatar/master' ... * qatar/master: swscale: try to use mmap only if available configure: check for mprotect wmapro: use planar sample format wmalossless: output in planar sample format wmadec: use float planar sample format output shorten: use planar sample format lavc: update documentation for AVFrame.extended_data Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-15 14:09:35 +02: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 commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
colorspace-test.c
input.c	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
libswscale.v	swscale: Do not make ff_ symbols globally visible.	2012-10-10 02:08:01 +02:00
Makefile
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_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h	Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'	2012-10-12 15:57:28 +02:00
swscale_unscaled.c	Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'	2012-10-12 15:57:28 +02:00
swscale-test.c	sws-test: raise limigts a bit.	2012-10-13 21:19:52 +02:00
swscale.c	sws: get rid of C99 signed overflows try #2	2012-10-14 05:16:59 +02:00
swscale.h	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
utils.c	Merge remote-tracking branch 'qatar/master'	2012-10-15 14:09:35 +02:00
version.h
yuv2rgb.c	yuv2rgb: fix declared array sizes, so they match actuals.	2012-10-11 18:20:24 +02:00