FFmpeg/libswscale
Michael Niedermayer a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 00:26:45 +02:00
..
arm swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
ppc ppc: don't return a value from a function declared void 2013-08-30 11:56:11 +02:00
x86 Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 2014-08-04 21:48:00 +02:00
bayer_template.c libswscale: bayer to rgb24 & yv12 colorspace converters 2014-02-23 02:38:22 +01:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
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 swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
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 Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01: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/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 Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 2014-08-07 20:52:40 +02:00
version.h Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00
yuv2rgb.c Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00