-
Michael Niedermayer authored
* commit '92806167': 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: 5c057433Merged-by: Michael Niedermayer <michaelni@gmx.at>
27513846