-
Michael Niedermayer authored
* commit '1481d24c': RGBA64 pixel formats Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/utils.c See: 9569a3c9 See: 92afb431, 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>
6b1ca170