1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
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
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
output.c
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 '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00
yuv2rgb.c