27513846f6
* 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>