1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libswscale
Michael Niedermayer e827f65618 Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'
* commit '33c827f632f95ffe3399b695a5a0d47b366b6e20':
  swscale: Properly scale YUV

Conflicts:
	libswscale/swscale_unscaled.c
	tests/ref/fate/filter-pixdesc-yuv420p10be
	tests/ref/fate/filter-pixdesc-yuv420p10le
	tests/ref/fate/filter-pixdesc-yuv420p9be
	tests/ref/fate/filter-pixdesc-yuv420p9le
	tests/ref/fate/filter-pixdesc-yuva420p10be
	tests/ref/fate/filter-pixdesc-yuva420p10le
	tests/ref/fate/filter-pixdesc-yuva420p9be
	tests/ref/fate/filter-pixdesc-yuva420p9le
	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: abe0b8e9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 01:30:08 +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 Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820' 2014-08-04 22:32:13 +02: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 Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 2014-04-09 03:36:38 +02: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 swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
swscale_unscaled.c Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20' 2014-12-06 01:30:08 +01:00
swscale-test.c Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820' 2014-08-04 22:32:13 +02:00
swscale.c swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
swscale.h Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 2014-08-07 20:52:40 +02:00
swscaleres.rc
utils.c swscale/utils: support bayer input + scaling, and bayer input + any supported output 2014-11-12 23:59:37 +01:00
version.h swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
yuv2rgb.c Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00