1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libswscale
Michael Niedermayer 02b3ac87f8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sws: disable yuv2rgb warning for planar rgb.

Conflicts:
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 14:17:06 +01:00
..
bfin Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ppc Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
sparc Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b' 2013-01-19 13:01:06 +01:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c sws: add planar RGB formats to isAnyRGB 2013-01-26 20:40:44 +01:00
libswscale.v swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
options.c sws: add AVOption flag for error diffusion dither 2013-01-19 02:38:48 +01:00
output.c Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821' 2013-02-10 13:49:53 +01:00
rgb2rgb_template.c Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
rgb2rgb.c Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
rgb2rgb.h swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
swscale_internal.h Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
swscale_unscaled.c Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608' 2013-02-10 13:55:51 +01:00
swscale-test.c libswscale/swscale-test: fix some const correctness 2012-12-26 03:14:59 +01:00
swscale.c sws: Fix "warning: comparison of distinct pointer types lacks a cast" 2013-02-04 14:34:13 +01:00
swscale.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
utils.c Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551' 2013-02-10 14:07:27 +01:00
version.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2013-02-10 14:17:06 +01:00