Michael Niedermayer 2ec77aae67 Merge remote-tracking branch 'qatar/master' ... * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-06-10 04:47:23 +02:00
..
rgb2rgb_template.c	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +02:00
rgb2rgb.c	rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.	2011-05-28 11:41:32 +02:00
swscale_mmx.c	Merge remote-tracking branch 'qatar/master'	2011-06-04 06:35:17 +02:00
swscale_template.c	Merge remote-tracking branch 'qatar/master'	2011-06-10 04:47:23 +02:00
yuv2rgb_mmx.c	swscale: Commits that could not be pulled earlier due to bugs #2	2011-05-29 02:14:45 +02:00
yuv2rgb_template.c	In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality.	2011-06-03 03:46:13 +02:00