Michael Niedermayer
27513846f6
Merge commit '928061670e873e816daa14827853b7e11221ff5f'
* commit '928061670e873e816daa14827853b7e11221ff5f':
libswscale: GBRAP input & output and GBRAP16 input support
Conflicts:
libswscale/input.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
tests/ref/fate/filter-pixdesc-gbrap
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: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 05:47:25 +01:00
..
2014-01-12 19:58:38 +01:00
2014-11-12 15:15:03 +01:00
2014-12-03 20:21:56 +01:00
2014-02-23 02:38:22 +01:00
2012-08-29 18:04:34 +02:00
2014-07-19 05:36:26 +02:00
2015-01-14 17:17:24 +01:00
2012-10-10 02:08:01 +02:00
2014-08-12 20:52:21 +02:00
2014-08-12 20:52:21 +02:00
2014-09-21 12:23:24 +02:00
2015-01-14 17:17:24 +01:00
2014-10-18 23:40:50 +02:00
2014-01-21 21:55:20 +01:00
2014-01-21 17:55:07 +01:00
2015-01-14 17:17:24 +01:00
2015-01-15 05:47:25 +01:00
2014-08-04 22:32:13 +02:00
2015-01-14 17:17:24 +01:00
2014-08-07 20:52:40 +02:00
2013-12-05 23:42:07 +01:00
2015-01-15 05:47:25 +01:00
2014-10-11 05:05:17 +02:00
2015-01-06 21:44:50 +01:00