1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libswscale
Michael Niedermayer 27513846f6 Merge commit '928061670e873e816daa14827853b7e11221ff5f'
* commit '928061670e873e816daa14827853b7e11221ff5f':
  libswscale: GBRAP input & output and GBRAP16 input support

Conflicts:
	libswscale/input.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

See: 5c057433cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 05:47:25 +01:00
..
arm swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
ppc libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian 2014-11-12 15:15:03 +01:00
x86 swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output 2014-12-03 20:21:56 +01:00
bayer_template.c libswscale: bayer to rgb24 & yv12 colorspace converters 2014-02-23 02:38:22 +01:00
colorspace-test.c
hscale_fast_bilinear.c sws: Move fast bilinear C code into seperate file 2014-07-19 05:36:26 +02:00
input.c libswscale: GBRAP input & output and GBRAP16 input support 2015-01-14 17:17:24 +01:00
libswscale.v
log2_tab.c lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
Makefile lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
options.c swscale: Allow chroma samples to be above and to the left of luma samples 2014-09-21 12:23:24 +02:00
output.c libswscale: GBRAP input & output and GBRAP16 input support 2015-01-14 17:17:24 +01:00
rgb2rgb_template.c Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650' 2014-10-18 23:40:50 +02:00
rgb2rgb.c Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01:00
rgb2rgb.h swscale: add nv12/nv21->yuv420 converter 2014-01-21 17:55:07 +01:00
swscale_internal.h libswscale: GBRAP input & output and GBRAP16 input support 2015-01-14 17:17:24 +01:00
swscale_unscaled.c Merge commit '928061670e873e816daa14827853b7e11221ff5f' 2015-01-15 05:47:25 +01:00
swscale-test.c Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820' 2014-08-04 22:32:13 +02:00
swscale.c libswscale: GBRAP input & output and GBRAP16 input support 2015-01-14 17:17:24 +01:00
swscale.h Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 2014-08-07 20:52:40 +02:00
swscaleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c Merge commit '928061670e873e816daa14827853b7e11221ff5f' 2015-01-15 05:47:25 +01:00
version.h swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
yuv2rgb.c Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa' 2015-01-06 21:44:50 +01:00