Michael Niedermayer 4917fecf4a Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' ...

* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-07 20:52:40 +02:00

..

arm

…

ppc

…

x86

Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'

2014-08-04 21:48:00 +02:00

bayer_template.c

…

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

…

Makefile

sws: Move fast bilinear C code into seperate file

2014-07-19 05:36:26 +02:00

options.c

swscale: add two spatially stable dithering methods

2014-03-25 13:48:06 +01:00

output.c

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

2014-04-09 03:36:38 +02:00

rgb2rgb_template.c

…

rgb2rgb.c

…

rgb2rgb.h

…

swscale_internal.h

swscale/swscale_internal: fix ya16 -> rgba

2014-08-05 01:51:11 +02:00

swscale_unscaled.c

swscale/swscale_unscaled: fix ya16 input

2014-08-05 00:33:27 +02:00

swscale-test.c

Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

2014-08-04 22:32:13 +02:00

swscale.c

sws: Move fast bilinear C code into seperate file

2014-07-19 05:36:26 +02:00

swscale.h

Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

2014-08-07 20:52:40 +02:00

swscaleres.rc

…

utils.c

Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

2014-08-07 20:52:40 +02:00

version.h

Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

2014-08-07 20:52:40 +02:00

yuv2rgb.c

Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'

2014-06-02 19:38:01 +02:00