RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libswscale
History
Michael Niedermayer bb2f4ae434 Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
	libswscale/output.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2013-01-28 14:11:31 +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
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02: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
options.c sws: add AVOption flag for error diffusion dither 2013-01-19 02:38:48 +01:00
output.c Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +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
rgb2rgb_template.c Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
swscale-test.c libswscale/swscale-test: fix some const correctness 2012-12-26 03:14:59 +01:00
swscale.c swscale: GBRP output support 2013-01-27 15:28:07 -05:00
swscale.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
swscale_internal.h Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
swscale_unscaled.c sws: use planarRgbToRgbWrapper only for 8bit per component 2013-01-26 20:40:44 +01:00
utils.c Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
version.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
yuv2rgb.c sws: disable yuv2rgb warning for planar rgb. 2013-01-26 23:09:58 +01:00