1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libswscale
Michael Niedermayer 6b1ca1709f Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9f4
See: 92afb43162, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 14:41:13 +01:00
..
arm swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
bfin Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' 2014-03-14 01:56:25 +01:00
ppc ppc: don't return a value from a function declared void 2013-08-30 11:56:11 +02:00
x86 Add missing external declarations. 2014-03-17 00:48:09 +01: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
input.c swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
libswscale.v swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
options.c swscale/options: switch default to bicubic 2013-10-06 10:47:09 +02:00
output.c Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3' 2013-08-16 12:56:48 +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 Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
swscale_unscaled.c libswscale: bayer to rgb24 & yv12 colorspace converters 2014-02-23 02:38:22 +01:00
swscale-test.c Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
swscale.c swscale: fix rgb48Toxyz12() endianness 2014-01-10 17:26:39 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2013-12-14 13:09:30 +01:00
swscaleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c RGBA64 pixel formats 2014-03-16 23:05:47 +01:00
version.h Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' 2013-12-27 12:01:23 +01:00
yuv2rgb.c Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00